The developer preview of Lion makes it pretty clear which way things are heading. I wouldn't expect much deviation from that on the Mac side. I'll be interested to see what they're planning for iOS 5 though.