Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/bridge/wm_shell_mus.cc

Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index a839b12eef3e19420fbc596895e83691fe4b96cb..5efbb801384cac4c8b7baaa85966f5d8719e61a1 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -22,7 +23,6 @@
 #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"
@@ -168,7 +168,7 @@ 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) {
@@ -202,34 +202,35 @@ WmWindow* WmShellMus::NewWindow(ui::wm::WindowType window_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());
 }
 
@@ -274,7 +275,7 @@ 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);
 }
 
@@ -306,7 +307,7 @@ bool WmShellMus::IsMouseEventsEnabled() {
 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;
 }
 
@@ -356,7 +357,7 @@ WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
 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>
@@ -435,10 +436,10 @@ void WmShellMus::SetLaserPointerEnabled(bool enabled) {
 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);
 }