Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

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/aura/wm_window_aura.h"
 #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_activation_observer.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/wm_window_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/window_manager.h"
 #include "ash/shared/immersive_fullscreen_controller.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/window.h"
@@ skipping 125 matching lines @@
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 void WmShellMus::AddRootWindowController(RootWindowController* controller) {
   root_window_controllers_.push_back(controller);
   // The first root window will be the initial root for new windows.
   if (!GetRootWindowForNewWindows())
-    set_root_window_for_new_windows(WmWindowMus::Get(controller->root()));
+    set_root_window_for_new_windows(ash::WmWindowAura::Get(controller->root()));
 }
 
 void WmShellMus::RemoveRootWindowController(RootWindowController* controller) {
   auto iter = std::find(root_window_controllers_.begin(),
                         root_window_controllers_.end(), controller);
   DCHECK(iter != root_window_controllers_.end());
   root_window_controllers_.erase(iter);
 }
 
 RootWindowController* WmShellMus::GetRootWindowControllerWithDisplayId(
@@ skipping 13 matching lines @@
 
 bool WmShellMus::IsRunningInMash() const {
   return true;
 }
 
 WmWindow* WmShellMus::NewWindow(ui::wm::WindowType window_type,
                                 ui::LayerType layer_type) {
   aura::Window* window = new aura::Window(nullptr);
   window->SetType(window_type);
   window->Init(layer_type);
-  return WmWindowMus::Get(window);
+  return ash::WmWindowAura::Get(window);
 }
 
 WmWindow* WmShellMus::GetFocusedWindow() {
   // TODO: remove as both WmShells use same implementation.
-  return WmWindowMus::Get(static_cast<aura::client::FocusClient*>(
-                              window_manager_->focus_controller())
-                              ->GetFocusedWindow());
+  return ash::WmWindowAura::Get(static_cast<aura::client::FocusClient*>(
+                                    window_manager_->focus_controller())
+                                    ->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetActiveWindow() {
   // TODO: remove as both WmShells use same implementation.
-  return WmWindowMus::Get(static_cast<aura::client::ActivationClient*>(
-                              window_manager_->focus_controller())
-                              ->GetActiveWindow());
+  return ash::WmWindowAura::Get(static_cast<aura::client::ActivationClient*>(
+                                    window_manager_->focus_controller())
+                                    ->GetActiveWindow());
 }
 
 WmWindow* WmShellMus::GetCaptureWindow() {
   // TODO: remove as both WmShells use same implementation.
-  return WmWindowMus::Get(::wm::CaptureController::Get()->GetCaptureWindow());
+  return ash::WmWindowAura::Get(
+      ::wm::CaptureController::Get()->GetCaptureWindow());
 }
 
 WmWindow* WmShellMus::GetPrimaryRootWindow() {
-  return WmWindowMus::Get(root_window_controllers_[0]->root());
+  return ash::WmWindowAura::Get(root_window_controllers_[0]->root());
 }
 
 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
-  return WmWindowMus::Get(
+  return ash::WmWindowAura::Get(
       GetRootWindowControllerWithDisplayId(display_id)->root());
 }
 
 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 24 matching lines @@
 
 bool WmShellMus::IsForceMaximizeOnFirstRun() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void WmShellMus::SetDisplayWorkAreaInsets(WmWindow* window,
                                           const gfx::Insets& insets) {
   RootWindowController* root_window_controller =
       RootWindowController::ForWindow(
-          static_cast<WmWindowMus*>(window)->aura_window());
+          static_cast<ash::WmWindowAura*>(window)->aura_window());
   root_window_controller->SetWorkAreaInests(insets);
 }
 
 bool WmShellMus::IsPinned() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void WmShellMus::SetPinnedWindow(WmWindow* window) {
   NOTIMPLEMENTED();
@@ skipping 11 matching lines @@
 
 bool WmShellMus::IsMouseEventsEnabled() {
   // TODO: http::/crbug.com/637853
   NOTIMPLEMENTED();
   return true;
 }
 
 std::vector<WmWindow*> WmShellMus::GetAllRootWindows() {
   std::vector<WmWindow*> wm_windows(root_window_controllers_.size());
   for (size_t i = 0; i < root_window_controllers_.size(); ++i)
-    wm_windows[i] = WmWindowMus::Get(root_window_controllers_[i]->root());
+    wm_windows[i] = ash::WmWindowAura::Get(root_window_controllers_[i]->root());
   return wm_windows;
 }
 
 void WmShellMus::RecordGestureAction(GestureActionType action) {
   // TODO: http://crbug.com/616581.
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::RecordUserMetricsAction(UserMetricsAction action) {
   // TODO: http://crbug.com/616581.
@@ skipping 29 matching lines @@
 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
   // TODO: needs implementation for mus, http://crbug.com/624967.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 std::unique_ptr<WorkspaceEventHandler> WmShellMus::CreateWorkspaceEventHandler(
     WmWindow* workspace_window) {
   return base::MakeUnique<WorkspaceEventHandlerMus>(
-      WmWindowMus::GetAuraWindow(workspace_window));
+      ash::WmWindowAura::GetAuraWindow(workspace_window));
 }
 
 std::unique_ptr<ImmersiveFullscreenController>
 WmShellMus::CreateImmersiveFullscreenController() {
   return base::MakeUnique<ImmersiveFullscreenController>();
 }
 
 std::unique_ptr<KeyEventWatcher> WmShellMus::CreateKeyEventWatcher() {
   // TODO: needs implementation for mus, http://crbug.com/649600.
   NOTIMPLEMENTED();
@@ skipping 58 matching lines @@
 
 void WmShellMus::SetLaserPointerEnabled(bool enabled) {
   NOTIMPLEMENTED();
 }
 
 // TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
 // TODO: Nuke and let client code use ActivationChangeObserver directly.
 void WmShellMus::OnWindowActivated(ActivationReason reason,
                                    aura::Window* gained_active,
                                    aura::Window* lost_active) {
-  WmWindow* gained_active_wm = WmWindowMus::Get(gained_active);
+  WmWindow* gained_active_wm = ash::WmWindowAura::Get(gained_active);
   if (gained_active_wm)
     set_root_window_for_new_windows(gained_active_wm->GetRootWindow());
-  WmWindow* lost_active_wm = WmWindowMus::Get(lost_active);
+  WmWindow* lost_active_wm = ash::WmWindowAura::Get(lost_active);
   for (auto& observer : activation_observers_)
     observer.OnWindowActivated(gained_active_wm, lost_active_wm);
 }
 
 }  // namespace mus
 }  // namespace ash