It certainly seems like they want to move in that direction, but it's critical that they retain the developer segment. It'll be game over for them if developers are unable to be productive on a Mac.
There's likely a way to make both of these things happen, to some degree. For instance, they could start with just locking Macs to the app store as a default that is changeable. (similar to how Android is locked down)