Removes ash::mus::RootWindowController

ash/mus/bridge/wm_shell_mus.cc

 // Copyright 2016 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/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/keyboard_ui_mus.h"
-#include "ash/mus/root_window_controller.h"
+#include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
+#include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
@@ skipping 102 matching lines @@
   WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 RootWindowController* WmShellMus::GetRootWindowControllerWithDisplayId(
     int64_t id) {
-  for (ash::RootWindowController* root_window_controller :
-       ash::RootWindowController::root_window_controllers()) {
+  for (RootWindowController* root_window_controller :
+       RootWindowController::root_window_controllers()) {
     RootWindowSettings* settings =
         GetRootWindowSettings(root_window_controller->GetRootWindow());
     DCHECK(settings);
-    if (settings->display_id == id) {
-      return RootWindowController::ForWindow(
-          root_window_controller->GetRootWindow());
-    }
+    if (settings->display_id == id)
+      return root_window_controller;
   }
   NOTREACHED();
   return nullptr;
 }
 
 aura::WindowTreeClient* WmShellMus::window_tree_client() {
   return window_manager_->window_tree_client();
 }
 
 void WmShellMus::Initialize(
@@ skipping 36 matching lines @@
   return WmWindow::Get(::wm::CaptureController::Get()->GetCaptureWindow());
 }
 
 WmWindow* WmShellMus::GetPrimaryRootWindow() {
   // NOTE: This is called before the RootWindowController has been created, so
   // it can't call through to RootWindowController to get all windows.
   return primary_root_window_;
 }
 
 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
-  return WmWindow::Get(
-      GetRootWindowControllerWithDisplayId(display_id)->root());
+  RootWindowController* root_window_controller =
+      GetRootWindowControllerWithDisplayId(display_id);
+  DCHECK(root_window_controller);
+  return WmWindow::Get(root_window_controller->GetRootWindow());
 }
 
 const display::ManagedDisplayInfo& WmShellMus::GetDisplayInfo(
     int64_t display_id) const {
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   static display::ManagedDisplayInfo fake_info;
   return fake_info;
 }
 
@@ skipping 21 matching lines @@
   return false;
 }
 
 bool WmShellMus::IsForceMaximizeOnFirstRun() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void WmShellMus::SetDisplayWorkAreaInsets(WmWindow* window,
                                           const gfx::Insets& insets) {
-  RootWindowController* root_window_controller =
-      RootWindowController::ForWindow(window->aura_window());
-  root_window_controller->SetWorkAreaInests(insets);
+  window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets);
 }
 
 bool WmShellMus::IsPinned() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void WmShellMus::SetPinnedWindow(WmWindow* window) {
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::LockCursor() {
   // TODO: http::/crbug.com/637853
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::UnlockCursor() {
   // TODO: http::/crbug.com/637853
   NOTIMPLEMENTED();
 }
 
 bool WmShellMus::IsMouseEventsEnabled() {
   // TODO: http::/crbug.com/637853
   NOTIMPLEMENTED();
   return true;
 }
 
 std::vector<WmWindow*> WmShellMus::GetAllRootWindows() {
   std::vector<WmWindow*> root_windows;
-  for (ash::RootWindowController* root_window_controller :
-       ash::RootWindowController::root_window_controllers()) {
+  for (RootWindowController* root_window_controller :
+       RootWindowController::root_window_controllers()) {
     root_windows.push_back(root_window_controller->GetWindow());
   }
   return root_windows;
 }
 
 void WmShellMus::RecordGestureAction(GestureActionType action) {
   // TODO: http://crbug.com/616581.
   NOTIMPLEMENTED();
 }
 
@@ skipping 109 matching lines @@
 }
 
 void WmShellMus::CreatePrimaryHost() {}
 
 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
   window_manager_->CreatePrimaryRootWindowController(
       base::WrapUnique(init_params.primary_window_tree_host));
 }
 }  // namespace mus
 }  // namespace ash