ash: Remove wm::GetRootWindowController.

ash/display/display_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/display/display_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
+#include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
 
 DisplayController::DisplayController()
     : secondary_display_layout_(RIGHT) {
   aura::Env::GetInstance()->display_manager()->AddObserver(this);
 }
 
 DisplayController::~DisplayController() {
   aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
   // Delete all root window controllers, which deletes root window
   // from the last so that the primary root window gets deleted last.
   for (std::map<int, aura::RootWindow*>::const_reverse_iterator it =
            root_windows_.rbegin(); it != root_windows_.rend(); ++it) {
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(it->second);
+        GetRootWindowController(it->second);
     // RootWindow may not have RootWindowController in non
     // extended desktop mode.
     if (controller)
       delete controller;
     else
       delete it->second;
   }
 }
 
 void DisplayController::InitPrimaryDisplay() {
@@ skipping 23 matching lines @@
 
 aura::RootWindow* DisplayController::GetRootWindowForDisplayId(int id) {
   return root_windows_[id];
 }
 
 void DisplayController::CloseChildWindows() {
   for (std::map<int, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     aura::RootWindow* root_window = it->second;
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(root_window);
+        GetRootWindowController(root_window);
     if (controller) {
       controller->CloseChildWindows();
     } else {
       while (!root_window->children().empty()) {
         aura::Window* child = root_window->children()[0];
         delete child;
       }
     }
   }
 }
 
 std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
   std::vector<aura::RootWindow*> windows;
   for (std::map<int, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     DCHECK(it->second);
-    if (wm::GetRootWindowController(it->second))
+    if (GetRootWindowController(it->second))
       windows.push_back(it->second);
   }
   return windows;
 }
 
 std::vector<internal::RootWindowController*>
 DisplayController::GetAllRootWindowControllers() {
   std::vector<internal::RootWindowController*> controllers;
   for (std::map<int, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(it->second);
+        GetRootWindowController(it->second);
     if (controller)
       controllers.push_back(controller);
   }
   return controllers;
 }
 
 void DisplayController::SetSecondaryDisplayLayout(
     SecondaryDisplayLayout layout) {
   secondary_display_layout_ = layout;
   UpdateDisplayBoundsForLayout();
@@ skipping 91 matching lines @@
 void DisplayController::OnDisplayRemoved(const gfx::Display& display) {
   aura::RootWindow* root = root_windows_[display.id()];
   DCHECK(root);
   // Primary display should never be removed by DisplayManager.
   DCHECK(root != Shell::GetPrimaryRootWindow());
   // Display for root window will be deleted when the Primary RootWindow
   // is deleted by the Shell.
   if (root != Shell::GetPrimaryRootWindow()) {
     root_windows_.erase(display.id());
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(root);
+        GetRootWindowController(root);
     if (controller) {
       controller->MoveWindowsTo(Shell::GetPrimaryRootWindow());
       delete controller;
     } else {
       delete root;
     }
   }
 }
 
 // static
@@ skipping 49 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace internal
 }  // namespace ash