commit bf9cdb36cc79becab099c9f37eb80284fb203f45
author ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 25 19:22:45 2013
committer ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 25 19:22:45 2013
tree 4c9011f0aa08ac613027abd372cec3a3b613032b
parent fef72c1c9890633a237e06ccb0d0f4ce2ca6c9c1

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

ash/root_window_settings.cc

diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index 06198ca..33880ed 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -22,17 +22,17 @@
       controller(NULL) {
 }
 
-RootWindowSettings* InitRootWindowSettings(aura::RootWindow* root) {
+RootWindowSettings* InitRootWindowSettings(aura::Window* root) {
   RootWindowSettings* settings = new RootWindowSettings();
   root->SetProperty(kRootWindowSettingsKey, settings);
   return settings;
 }
 
-RootWindowSettings* GetRootWindowSettings(aura::RootWindow* root) {
+RootWindowSettings* GetRootWindowSettings(aura::Window* root) {
   return root->GetProperty(kRootWindowSettingsKey);
 }
 
-const RootWindowSettings* GetRootWindowSettings(const aura::RootWindow* root) {
+const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) {
   return root->GetProperty(kRootWindowSettingsKey);
 }