[mus+ash] removes WmWindow, wm_window.h and wm_window.cc

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 99 matching lines @@
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/trace_event/trace_event.h"
 #include "chromeos/audio/audio_a11y_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 120 matching lines @@
 // static
 RootWindowController* Shell::GetPrimaryRootWindowController() {
   CHECK(HasInstance());
   return GetRootWindowController(GetPrimaryRootWindow());
 }
 
 // static
 Shell::RootWindowControllerList Shell::GetAllRootWindowControllers() {
   CHECK(HasInstance());
   RootWindowControllerList root_window_controllers;
-  for (WmWindow* root_window : instance_->shell_port_->GetAllRootWindows())
-    root_window_controllers.push_back(root_window->GetRootWindowController());
+  for (aura::Window* root_window :
+       instance_->shell_port_->GetAllRootWindows()) {
+    root_window_controllers.push_back(
+        RootWindowController::ForWindow(root_window));
+  }
   return root_window_controllers;
 }
 
 // static
 RootWindowController* Shell::GetRootWindowControllerWithDisplayId(
     int64_t display_id) {
   CHECK(HasInstance());
   aura::Window* root_window =
       instance_->shell_port_->GetRootWindowForDisplayId(display_id);
   return GetRootWindowController(root_window);
@@ skipping 10 matching lines @@
   CHECK(Shell::HasInstance());
   Shell* shell = Shell::Get();
   if (shell->scoped_root_window_for_new_windows_)
     return shell->scoped_root_window_for_new_windows_;
   return shell->root_window_for_new_windows_;
 }
 
 // static
 aura::Window::Windows Shell::GetAllRootWindows() {
   CHECK(HasInstance());
-  aura::Window::Windows windows;
-  for (WmWindow* window : instance_->shell_port_->GetAllRootWindows())
-    windows.push_back(window->aura_window());
-  return windows;
+  return instance_->shell_port_->GetAllRootWindows();
 }
 
 // static
 aura::Window* Shell::GetContainer(aura::Window* root_window, int container_id) {
   return root_window->GetChildById(container_id);
 }
 
 // static
 const aura::Window* Shell::GetContainer(const aura::Window* root_window,
                                         int container_id) {
@@ skipping 72 matching lines @@
 
 ShelfModel* Shell::shelf_model() {
   return shelf_controller_->model();
 }
 
 ::wm::ActivationClient* Shell::activation_client() {
   return focus_controller_.get();
 }
 
 void Shell::UpdateShelfVisibility() {
-  for (WmWindow* root : shell_port_->GetAllRootWindows())
-    root->GetRootWindowController()->shelf()->UpdateVisibilityState();
+  for (auto* root_window_controller : GetAllRootWindowControllers())
+    root_window_controller->shelf()->UpdateVisibilityState();
 }
 
 PrefService* Shell::GetActiveUserPrefService() const {
   if (shell_port_->GetAshConfig() == Config::MASH)
     return pref_service_.get();
 
   return shell_delegate_->GetActiveUserPrefService();
 }
 
 WebNotificationTray* Shell::GetWebNotificationTray() {
@@ skipping 72 matching lines @@
 
 bool Shell::IsAppListVisible() const {
   return app_list_->IsVisible();
 }
 
 bool Shell::GetAppListTargetVisibility() const {
   return app_list_->GetTargetVisibility();
 }
 
 void Shell::UpdateAfterLoginStatusChange(LoginStatus status) {
-  for (WmWindow* root_window : shell_port_->GetAllRootWindows()) {
-    root_window->GetRootWindowController()->UpdateAfterLoginStatusChange(
-        status);
-  }
+  for (auto* root_window_controller : GetAllRootWindowControllers())
+    root_window_controller->UpdateAfterLoginStatusChange(status);
 }
 
 void Shell::NotifyMaximizeModeStarted() {
   for (auto& observer : shell_observers_)
     observer.OnMaximizeModeStarted();
 }
 
 void Shell::NotifyMaximizeModeEnding() {
   for (auto& observer : shell_observers_)
     observer.OnMaximizeModeEnding();
@@ skipping 159 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 (WmWindow* root : shell_port_->GetAllRootWindows())
-    root->GetRootWindowController()->shelf()->ShutdownShelfWidget();
+  for (auto* root_window_controller : GetAllRootWindowControllers())
+    root_window_controller->shelf()->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 482 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 (WmWindow* wm_root_window : shell_port_->GetAllRootWindows()) {
-    aura::Window* root_window = wm_root_window->aura_window();
+  for (aura::Window* root_window : shell_port_->GetAllRootWindows()) {
     RootWindowController* controller = GetRootWindowController(root_window);
     if (controller) {
       controller->CloseChildWindows();
     } else {
       while (!root_window->children().empty()) {
         aura::Window* child = root_window->children()[0];
         delete child;
       }
     }
   }
@@ skipping 83 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