Move GetRootWindowController to root_window_controller.h

Remove unnecessary includes, forward decls

BUG=272460

Review URL: https://chromiumcodereview.appspot.com/24020002

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

9 files changed, 8 insertions, 43 deletions

diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index ea5e4f4..b142288 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -11,7 +11,6 @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/property_util.h"
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/pagination_model.h"
diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc
index 5450e97..8b8468f 100644
--- a/ash/wm/gestures/long_press_affordance_handler.cc
+++ b/ash/wm/gestures/long_press_affordance_handler.cc
@@ -8,7 +8,6 @@
 #include "ash/shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/property_util.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ -26,6 +25,8 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+namespace ash {
+namespace internal {
 namespace {
 
 const int kAffordanceOuterRadius = 60;
@@ -69,9 +70,8 @@ views::Widget* CreateAffordanceWidget(aura::RootWindow* root_window) {
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->SetOpacity(0xFF);
-  ash::GetRootWindowController(root_window)->GetContainer(
-      ash::internal::kShellWindowId_OverlayContainer)->AddChild(
-          widget->GetNativeWindow());
+  GetRootWindowController(root_window)->GetContainer(
+      kShellWindowId_OverlayContainer)->AddChild(widget->GetNativeWindow());
   return widget;
 }
 
@@ -133,9 +133,6 @@ void PaintAffordanceGlow(gfx::Canvas* canvas,
 
 }  // namespace
 
-namespace ash {
-namespace internal {
-
 // View of the LongPressAffordanceHandler. Draws the actual contents and
 // updates as the animation proceeds. It also maintains the views::Widget that
 // the animation is shown in.
@@ -297,7 +294,7 @@ void LongPressAffordanceHandler::StartAnimation() {
   aura::RootWindow* root_window = NULL;
   switch (current_animation_type_) {
     case GROW_ANIMATION:
-      root_window = ash::Shell::GetInstance()->display_controller()->
+      root_window = Shell::GetInstance()->display_controller()->
           GetRootWindowForDisplayId(tap_down_display_id_);
       if (!root_window) {
         StopAnimation();
diff --git a/ash/wm/property_util.cc b/ash/wm/property_util.cc
index 4c0470a..5aac996 100644
--- a/ash/wm/property_util.cc
+++ b/ash/wm/property_util.cc
@@ -4,13 +4,9 @@
 
 #include "ash/wm/property_util.h"
 
-#include "ash/ash_export.h"
-#include "ash/root_window_settings.h"
 #include "ash/screen_ash.h"
 #include "ash/wm/window_properties.h"
-#include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
@@ -65,15 +61,4 @@ bool GetWindowAlwaysRestoresToRestoreBounds(const aura::Window* window) {
   return window->GetProperty(internal::kWindowRestoresToRestoreBounds);
 }
 
-internal::RootWindowController* GetRootWindowController(
-    const aura::RootWindow* root_window) {
-  return root_window ?
-      internal::GetRootWindowSettings(root_window)->controller : NULL;
-}
-
-void SetRootWindowController(aura::RootWindow* root_window,
-                             internal::RootWindowController* controller) {
-  internal::GetRootWindowSettings(root_window)->controller = controller;
-}
-
 }  // namespace ash
diff --git a/ash/wm/property_util.h b/ash/wm/property_util.h
index 41a9d93..365a373e 100644
--- a/ash/wm/property_util.h
+++ b/ash/wm/property_util.h
@@ -8,7 +8,6 @@
 #include "ash/ash_export.h"
 
 namespace aura {
-class RootWindow;
 class Window;
 }
 
@@ -17,9 +16,6 @@ class Rect;
 }
 
 namespace ash {
-namespace internal {
-class RootWindowController;
-}
 
 // Sets the restore bounds property on |window| in the virtual screen
 // coordinates.  Deletes existing bounds value if exists.
@@ -63,13 +59,6 @@ ASH_EXPORT bool GetWindowAlwaysRestoresToRestoreBounds(
 ASH_EXPORT void SetTrackedByWorkspace(aura::Window* window, bool value);
 ASH_EXPORT bool GetTrackedByWorkspace(const aura::Window* window);
 
-// Sets/Gets the RootWindowController for |root_window|.
-ASH_EXPORT void SetRootWindowController(
-    aura::RootWindow* root_window,
-    internal::RootWindowController* controller);
-ASH_EXPORT internal::RootWindowController* GetRootWindowController(
-    const aura::RootWindow* root_window);
-
-}
+}  // namespace ash
 
 #endif  // ASH_WM_PROPERTY_UTIL_H_
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc
index 584bc06..16620f6 100644
--- a/ash/wm/root_window_layout_manager.cc
+++ b/ash/wm/root_window_layout_manager.cc
@@ -6,7 +6,6 @@
 
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/root_window_controller.h"
-#include "ash/wm/property_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 026924c..4476a86 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -10,7 +10,6 @@
 #include "ash/shell_window_ids.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/coordinate_conversion.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
@@ -56,7 +55,8 @@ bool IsPanelAttached(aura::Window* window) {
 
 internal::AlwaysOnTopController*
 GetAlwaysOnTopController(aura::RootWindow* root_window) {
-  return GetRootWindowController(root_window)->always_on_top_controller();
+  return internal::GetRootWindowController(root_window)->
+      always_on_top_controller();
 }
 
 }  // namespace
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index b368822..4371bd0 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -14,7 +14,6 @@
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 #include "ash/wm/gestures/system_pinch_handler.h"
 #include "ash/wm/gestures/two_finger_drag_handler.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
diff --git a/ash/wm/window_util.h b/ash/wm/window_util.h
index 6822a77..c114b8d 100644
--- a/ash/wm/window_util.h
+++ b/ash/wm/window_util.h
@@ -10,7 +10,6 @@
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
-class RootWindow;
 class Window;
 }
 
@@ -20,7 +19,6 @@ class Rect;
 
 namespace ui {
 class Event;
-class Layer;
 }
 
 namespace ash {
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
index 44e7bfa5..b39213e 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -12,7 +12,6 @@
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/frame_painter.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"