Make GetRootWindow() return a Window instead of a RootWindow.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 80576260cadf53bf3a1a0e1ed6cb98941b4ef1f0..12fe56469c23c02a1f3ede4f6514d53ef22db3c0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -252,15 +252,15 @@ class ChromeLauncherController : public ash::LauncherDelegate,
 
   // Gets the shelf auto-hide behavior on |root_window|.
   ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
-      aura::RootWindow* root_window) const;
+      aura::Window* root_window) const;
 
   // Returns |true| if the user is allowed to modify the shelf auto-hide
   // behavior on |root_window|.
-  bool CanUserModifyShelfAutoHideBehavior(aura::RootWindow* root_window) const;
+  bool CanUserModifyShelfAutoHideBehavior(aura::Window* root_window) const;
 
   // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
   // user is not allowed to modify the auto-hide behavior.
-  void ToggleShelfAutoHideBehavior(aura::RootWindow* root_window);
+  void ToggleShelfAutoHideBehavior(aura::Window* root_window);
 
   // The tab no longer represents its previously identified application.
   void RemoveTabFromRunningApp(content::WebContents* tab,
@@ -308,7 +308,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ash::ShellObserver overrides:
-  virtual void OnShelfAlignmentChanged(aura::RootWindow* root_window) OVERRIDE;
+  virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
 
   // ash::DisplayController::Observer overrides:
   virtual void OnDisplayConfigurationChanging() OVERRIDE;
@@ -330,7 +330,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
 
   // ash::ShelfLayoutManagerObserver overrides:
   virtual void OnAutoHideBehaviorChanged(
-      aura::RootWindow* root_window,
+      aura::Window* root_window,
       ash::ShelfAutoHideBehavior new_behavior) OVERRIDE;
 
   // Called when the active user has changed.
@@ -433,7 +433,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
 
   // Persists the shelf auto-hide behavior to prefs.
   void SetShelfAutoHideBehaviorPrefs(ash::ShelfAutoHideBehavior behavior,
-                                     aura::RootWindow* root_window);
+                                     aura::Window* root_window);
 
   // Sets the shelf auto-hide behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();