Move GetRootWindowController() to root_window_controller.h

ash/root_window_controller.cc

Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 27f0a0144d48736b8a5c70a49245e94c768a8636..e988e9c1d48d3a900c2a746b9f012f25e8ffc21b 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -32,7 +32,6 @@
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/panels/panel_window_event_handler.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/stacking_controller.h"
@@ -219,7 +218,7 @@ RootWindowController::RootWindowController(aura::RootWindow* root_window)
       panel_layout_manager_(NULL),
       touch_hud_debug_(NULL),
       touch_hud_projection_(NULL) {
-  SetRootWindowController(root_window, this);
+  GetRootWindowSettings(root_window)->controller = this;
   screen_dimmer_.reset(new ScreenDimmer(root_window));
 
   stacking_controller_.reset(new StackingController);
@@ -248,7 +247,7 @@ RootWindowController* RootWindowController::ForWindow(
 
 // static
 RootWindowController* RootWindowController::ForActiveRootWindow() {
-  return GetRootWindowController(Shell::GetActiveRootWindow());
+  return internal::GetRootWindowController(Shell::GetActiveRootWindow());
 }
 
 void RootWindowController::SetWallpaperController(
@@ -282,7 +281,7 @@ void RootWindowController::Shutdown() {
   }
 
   CloseChildWindows();
-  SetRootWindowController(root_window_.get(), NULL);
+  GetRootWindowSettings(root_window_.get())->controller = NULL;
   screen_dimmer_.reset();
   workspace_controller_.reset();
   // Forget with the display ID so that display lookup
@@ -818,5 +817,10 @@ void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
     DisableTouchHudProjection();
 }
 
+RootWindowController* GetRootWindowController(
+    const aura::RootWindow* root_window) {
+  return root_window ? GetRootWindowSettings(root_window)->controller : NULL;

[Daniel Erat, 2013/09/06 01:00:35]

is it valid to pass a NULL root window, or would it make more sense to add a
DCHECK() here?

[oshima, 2013/09/06 01:11:06]

It is valid. This is to avoid boiler plate code like

if (window->GetRootWindow()) {
  RootWindowController* controller =
GetRootWindowCotnroller(window->GetRootWindow());
  if (controller) {
     Do something root window controller
  }
}

+}
+
 }  // namespace internal
 }  // namespace ash