Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 232 matching lines @@
 }
 
 // static
 void Shell::DeleteInstance() {
   delete instance_;
 }
 
 // static
 RootWindowController* Shell::GetPrimaryRootWindowController() {
   CHECK(HasInstance());
-  return GetRootWindowController(GetPrimaryRootWindow());
+  return RootWindowController::ForWindow(GetPrimaryRootWindow());
 }
 
 // static
 Shell::RootWindowControllerList Shell::GetAllRootWindowControllers() {
   CHECK(HasInstance());
   RootWindowControllerList root_window_controllers;
-  for (aura::Window* root_window :
-       instance_->shell_port_->GetAllRootWindows()) {
-    root_window_controllers.push_back(
-        RootWindowController::ForWindow(root_window));
-  }
+  for (aura::Window* root : GetAllRootWindows())
+    root_window_controllers.push_back(RootWindowController::ForWindow(root));
   return root_window_controllers;
 }
 
 // static
 RootWindowController* Shell::GetRootWindowControllerWithDisplayId(
     int64_t display_id) {
   CHECK(HasInstance());
-  aura::Window* root_window =
+  aura::Window* root =
       instance_->shell_port_->GetRootWindowForDisplayId(display_id);
-  return GetRootWindowController(root_window);
+  return root ? RootWindowController::ForWindow(root) : nullptr;
 }
 
 // static
 aura::Window* Shell::GetPrimaryRootWindow() {
   CHECK(HasInstance());
   return instance_->shell_port_->GetPrimaryRootWindow();
 }
 
 // static
 aura::Window* Shell::GetRootWindowForNewWindows() {
@@ skipping 93 matching lines @@
 
 ShelfModel* Shell::shelf_model() {
   return shelf_controller_->model();
 }
 
 ::wm::ActivationClient* Shell::activation_client() {
   return focus_controller_.get();
 }
 
 void Shell::UpdateShelfVisibility() {
-  for (auto* root_window_controller : GetAllRootWindowControllers())
-    root_window_controller->shelf()->UpdateVisibilityState();
+  for (aura::Window* root : GetAllRootWindows())
+    Shelf::ForWindow(root)->UpdateVisibilityState();
 }
 
 PrefService* Shell::GetActiveUserPrefService() const {
   if (shell_port_->GetAshConfig() == Config::MASH)
     return pref_service_.get();
 
   return shell_delegate_->GetActiveUserPrefService();
 }
 
 WebNotificationTray* Shell::GetWebNotificationTray() {
@@ skipping 253 matching lines @@
   maximize_mode_controller_.reset();
 
   // Destroy the keyboard before closing the shelf, since it will invoke a shelf
   // layout.
   DeactivateKeyboard();
 
   toast_manager_.reset();
 
   // Destroy SystemTrayDelegate before destroying the status area(s). Make sure
   // to deinitialize the shelf first, as it is initialized after the delegate.
-  for (auto* root_window_controller : GetAllRootWindowControllers())
-    root_window_controller->shelf()->ShutdownShelfWidget();
+  for (aura::Window* root : GetAllRootWindows())
+    Shelf::ForWindow(root)->ShutdownShelfWidget();
   tray_bluetooth_helper_.reset();
   DeleteSystemTrayDelegate();
 
   // Drag-and-drop must be canceled prior to close all windows.
   drag_drop_controller_.reset();
 
   // Controllers who have WindowObserver added must be deleted
   // before |window_tree_host_manager_| is deleted.
 
   // VideoActivityNotifier must be deleted before |video_detector_| is
@@ skipping 36 matching lines @@
   mouse_cursor_filter_.reset();
   modality_filter_.reset();
 
   touch_transformer_controller_.reset();
   audio_a11y_controller_.reset();
   laser_pointer_controller_.reset();
   partial_magnification_controller_.reset();
 
   // This also deletes all RootWindows. Note that we invoke Shutdown() on
   // WindowTreeHostManager before resetting |window_tree_host_manager_|, since
-  // destruction
-  // of its owned RootWindowControllers relies on the value.
+  // destruction of its owned RootWindowControllers relies on the value.
   ScreenAsh::CreateScreenForShutdown();
   display_configuration_controller_.reset();
 
   // AppListDelegateImpl depends upon AppList.
   app_list_delegate_impl_.reset();
 
   // These members access Shell in their destructors.
   wallpaper_controller_.reset();
   accessibility_delegate_.reset();
 
@@ skipping 424 matching lines @@
 }
 
 void Shell::DeleteSystemTrayDelegate() {
   DCHECK(system_tray_delegate_);
   // Accesses ShellPort in its destructor.
   logout_confirmation_controller_.reset();
   system_tray_delegate_.reset();
 }
 
 void Shell::CloseAllRootWindowChildWindows() {
-  for (aura::Window* root_window : shell_port_->GetAllRootWindows()) {
-    RootWindowController* controller = GetRootWindowController(root_window);
+  for (aura::Window* root : GetAllRootWindows()) {
+    RootWindowController* controller = RootWindowController::ForWindow(root);
     if (controller) {
       controller->CloseChildWindows();
     } else {
-      while (!root_window->children().empty()) {
-        aura::Window* child = root_window->children()[0];
+      while (!root->children().empty()) {
+        aura::Window* child = root->children()[0];
         delete child;
       }
     }
   }
 }
 
 bool Shell::CanWindowReceiveEvents(aura::Window* window) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowController* controller : controllers) {
     if (controller->CanWindowReceiveEvents(window))
@@ skipping 77 matching lines @@
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash