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

ash/mus/bridge/shell_port_mash.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/shell_port_mash.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 33 matching lines @@
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_cycle_event_filter.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "ash/wm_display_observer.h"
-#include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/mus/window_tree_host_mus_init_params.h"
 #include "ui/aura/window.h"
@@ skipping 199 matching lines @@
   window_manager_->window_manager_client()->SetGlobalOverrideCursor(
       std::move(cursor));
 }
 
 bool ShellPortMash::IsMouseEventsEnabled() {
   // TODO: http://crbug.com/637853
   NOTIMPLEMENTED();
   return true;
 }
 
-std::vector<WmWindow*> ShellPortMash::GetAllRootWindows() {
-  if (GetAshConfig() == Config::MUS) {
-    aura::Window::Windows root_windows =
-        Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
-    std::vector<WmWindow*> wm_windows(root_windows.size());
-    for (size_t i = 0; i < root_windows.size(); ++i)
-      wm_windows[i] = WmWindow::Get(root_windows[i]);
-    return wm_windows;
-  }
-  std::vector<WmWindow*> root_windows;
+std::vector<aura::Window*> ShellPortMash::GetAllRootWindows() {
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
+
+  aura::Window::Windows root_windows;
   for (RootWindowController* root_window_controller :
        RootWindowController::root_window_controllers()) {
-    root_windows.push_back(root_window_controller->GetWindow());
+    root_windows.push_back(root_window_controller->GetRootWindow());
   }
   return root_windows;
 }
 
 void ShellPortMash::RecordGestureAction(GestureActionType action) {
   if (GetAshConfig() == Config::MUS) {
     TouchUMA::GetInstance()->RecordGestureAction(action);
     return;
   }
   // TODO: http://crbug.com/616581.
@@ skipping 300 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash