Of course, Apple will not do this completely overnight, but it does seem like we're moving in that direction one step at a time. I think Apple/Steve's long term vision has always been for the PC to be like all other electronic devices; you buy it configured, and for fixes/upgrades you always go through the manufacturer or manufacturer-approved process. It is a complete opposite to something like a Lenovo ThinkPad where a lot of the stuff is user replaceable and serviceable (hence making it a little more future proof and much cheaper for upgrades).
As a MBP user, I am happy with where Apple is right now but I'm not sure I'm completely happy with where they're headed (and Apple doesn't care about customers like me who are probably < 5% anyway). Even if we look at Apple's website (for e.g. about battery), the terminology changes from 'User replaceable battery' to 'Battery that you should not replace yourself' etc. Apple could very well make the next major iteration of Mac OS similar to iOS (i.e. Apple is the only App store, no side-loading). Minor upgrades (RAM, HDD) could cost a lot and could only be done by Apple.
Something to think about before investing a lot in Apple products and becoming tangled in the ecosystem.