Remove some uses of RootWindow in Ash.

Adds a window() accessor to RootWindow. This is redundant now but necessary for when RootWindow is no longer a RootWindow. A subsequent CL will sever that relationship.

R=sky@chromium.org
http://crbug.com/308843

Review URL: https://codereview.chromium.org/67083004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234082 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 12 deletions

diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 8673d0f..5557398 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -43,12 +43,6 @@ namespace {
 // changed?
 const int kWallpaperReloadDelayMs = 2000;
 
-internal::RootWindowLayoutManager* GetRootWindowLayoutManager(
-    aura::RootWindow* root_window) {
-  return static_cast<internal::RootWindowLayoutManager*>(
-      root_window->layout_manager());
-}
-
 }  // namespace
 
 const int kSmallWallpaperMaxWidth = 1366;
@@ -196,7 +190,7 @@ WallpaperLayout DesktopBackgroundController::GetWallpaperLayout() const {
 }
 
 void DesktopBackgroundController::OnRootWindowAdded(
-    aura::RootWindow* root_window) {
+    aura::Window* root_window) {
   // The background hasn't been set yet.
   if (desktop_background_mode_ == BACKGROUND_NONE)
     return;
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index 55a816a..4cfbc8e 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -14,7 +14,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
-#include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -23,7 +22,7 @@ typedef unsigned int SkColor;
 class CommandLine;
 
 namespace aura {
-class RootWindow;
+class Window;
 }
 
 namespace ash {
@@ -97,7 +96,7 @@ class ASH_EXPORT DesktopBackgroundController
   WallpaperLayout GetWallpaperLayout() const;
 
   // Initialize root window's background.
-  void OnRootWindowAdded(aura::RootWindow* root_window);
+  void OnRootWindowAdded(aura::Window* root_window);
 
   // Loads builtin wallpaper asynchronously and sets to current wallpaper
   // after loaded. Returns true if the controller started loading the
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index bd23b09..8d0aa67 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -92,7 +92,7 @@ void DesktopBackgroundWidgetController::SetBounds(gfx::Rect bounds) {
     widget_->SetBounds(bounds);
 }
 
-bool DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
+bool DesktopBackgroundWidgetController::Reparent(aura::Window* root_window,
                                                  int src_container,
                                                  int dest_container) {
   if (widget_) {
diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h
index c6fbbaa..5976f28 100644
--- a/ash/desktop_background/desktop_background_widget_controller.h
+++ b/ash/desktop_background/desktop_background_widget_controller.h
@@ -37,7 +37,7 @@ class ASH_EXPORT DesktopBackgroundWidgetController
   // Move component from |src_container| in |root_window| to |dest_container|.
   // It is required for lock screen, when we need to move background so that
   // it hides user's windows. Returns true if there was something to reparent.
-  bool Reparent(aura::RootWindow* root_window,
+  bool Reparent(aura::Window* root_window,
                 int src_container,
                 int dest_container);