Mac: Better handling when someone else is the app delegate.

--HG--
extra : rebase_source : a2d99f3c2d93c0a6adeaf04fccec23799cc52de9