After looking at the images, I am going to say 7Dm2. The layout of the controls and design look MUCH closer to my 7D than to the 5D in my opinion. The 1Dx is full frame so why release another full frame right after it when you can stagger in an APS-C covering both sensor sizes and then bring the 5D after? Of course, I am just guessing!And I say this with no flash even. But, I guess we'll see.
Well, that would mean that Canon would be removing the pop up flash from the 7D. APS-C cams have always had a flash. The 7D is basically a Rebel 1D. I don't think the 7D will lose it's flash.