diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 17:35:34 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 17:35:34 +0000 |
commit | 553dfa5181462615f22266838b636d383b5f730f (patch) | |
tree | 37ff80bad3c23e9735a5c5e2072b72cba4077894 /ui/aura/root_window_host.h | |
parent | cccdb792cbe7b444949b87fc981d091dfba8bd96 (diff) | |
download | chromium_src-553dfa5181462615f22266838b636d383b5f730f.zip chromium_src-553dfa5181462615f22266838b636d383b5f730f.tar.gz chromium_src-553dfa5181462615f22266838b636d383b5f730f.tar.bz2 |
Change how you get to the MessageLoop::Dispatcher.
Previously, you would ask the RootWindow (a singleton) for its dispatcher, which was conveniently the RootWindowHost. Now that we are moving towards many RootWindows, you must ask the new singleton, aura::Env, instead.
This CL also implements a dispatcher for windows. It does not implement the Linux one since that's much larger and I'll do that in a followon CL. I just wanted to change the API. Note there is some transitional ugliness.
http://crbug.com/112131
TEST=existing
Review URL: https://chromiumcodereview.appspot.com/9433072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host.h')
-rw-r--r-- | ui/aura/root_window_host.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/aura/root_window_host.h b/ui/aura/root_window_host.h index a6c7c53..4af42ac 100644 --- a/ui/aura/root_window_host.h +++ b/ui/aura/root_window_host.h @@ -23,7 +23,7 @@ class RootWindow; // RootWindowHost bridges between a native window and the embedded RootWindow. // It provides the accelerated widget and maps events from the native os to // aura. -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) class RootWindowHost { #else class RootWindowHost : public MessageLoop::Dispatcher { @@ -86,6 +86,11 @@ class RootWindowHost : public MessageLoop::Dispatcher { // Posts |native_event| to the platform's event queue. #if !defined(OS_MACOSX) virtual void PostNativeEvent(const base::NativeEvent& native_event) = 0; + +#if !defined(OS_WIN) + // See documentation for RootWindow::GetDispatcher(). + virtual MessageLoop::Dispatcher* GetDispatcher() = 0; +#endif #endif }; |