Move GetRootWindowController() to root_window_controller.h

ash/root_window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 14 matching lines @@
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #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"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_background_controller.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
@@ skipping 166 matching lines @@
 
 namespace internal {
 
 RootWindowController::RootWindowController(aura::RootWindow* root_window)
     : root_window_(root_window),
       root_window_layout_(NULL),
       docked_layout_manager_(NULL),
       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);
   aura::client::SetStackingClient(root_window, stacking_controller_.get());
   capture_client_.reset(new views::corewm::ScopedCaptureClient(root_window));
 }
 
 RootWindowController::~RootWindowController() {
   Shutdown();
   root_window_.reset();
   // The CaptureClient needs to be around for as long as the RootWindow is
   // valid.
   capture_client_.reset();
 }
 
 // static
 RootWindowController* RootWindowController::ForLauncher(aura::Window* window) {
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
 RootWindowController* RootWindowController::ForWindow(
     const aura::Window* window) {
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
 RootWindowController* RootWindowController::ForActiveRootWindow() {
-  return GetRootWindowController(Shell::GetActiveRootWindow());
+  return internal::GetRootWindowController(Shell::GetActiveRootWindow());
 }
 
 void RootWindowController::SetWallpaperController(
     DesktopBackgroundWidgetController* controller) {
   wallpaper_controller_.reset(controller);
 }
 
 void RootWindowController::SetAnimatingWallpaperController(
     AnimatingDesktopController* controller) {
   if (animating_wallpaper_controller_.get())
@@ skipping 13 matching lines @@
   // being removed triggers a relayout of the shelf it will try to build a
   // window list adding windows from the active root window's containers which
   // may have already gone away.
   if (Shell::GetActiveRootWindow() == root_window_) {
     Shell::GetInstance()->set_active_root_window(
         Shell::GetPrimaryRootWindow() == root_window_.get() ?
         NULL : Shell::GetPrimaryRootWindow());
   }
 
   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
   // ends up with invalid display.
   internal::GetRootWindowSettings(root_window_.get())->display_id =
       gfx::Display::kInvalidDisplayID;
   // And this root window should no longer process events.
   root_window_->PrepareForShutdown();
 
   system_background_.reset();
@@ skipping 515 matching lines @@
   shelf_->shelf_layout_manager()->UpdateVisibilityState();
 }
 
 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
   if (enabled)
     EnableTouchHudProjection();
   else
     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