diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
| commit | bf9cdb36cc79becab099c9f37eb80284fb203f45 (patch) | |
| tree | 4c9011f0aa08ac613027abd372cec3a3b613032b /ash/root_window_settings.h | |
| parent | fef72c1c9890633a237e06ccb0d0f4ce2ca6c9c1 (diff) | |
| download | chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.zip chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.gz chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.bz2 | |
Make GetRootWindow() return a Window instead of a RootWindow.
Also adds a typedef from RootWindow to WindowEventDispatcher, the eventual name of this type.
Adds a GetDispatcher() method that crawls up to the root Window and returns the WindowEventDispatcher.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/37733003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_settings.h')
| -rw-r--r-- | ash/root_window_settings.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/root_window_settings.h b/ash/root_window_settings.h index 784cce6..e49b0f2 100644 --- a/ash/root_window_settings.h +++ b/ash/root_window_settings.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" namespace aura { -class RootWindow; +class Window; } namespace ash { @@ -37,14 +37,14 @@ struct RootWindowSettings { // Initializes and returns RootWindowSettings for |root|. // It is owned by the |root|. -RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root); +RootWindowSettings* InitRootWindowSettings(aura::Window* root); // Returns the RootWindowSettings for |root|. -ASH_EXPORT RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root); +ASH_EXPORT RootWindowSettings* GetRootWindowSettings(aura::Window* root); // const version of GetRootWindowSettings. ASH_EXPORT const RootWindowSettings* -GetRootWindowSettings(const aura::RootWindow* root); +GetRootWindowSettings(const aura::Window* root); } // namespace internal } // namespace ash |