Moves mash/wm into ash/mus

ash/mus/bridge/wm_globals_mus.cc

Index: ash/mus/bridge/wm_globals_mus.cc
diff --git a/mash/wm/bridge/wm_globals_mus.cc b/ash/mus/bridge/wm_globals_mus.cc
similarity index 63%
rename from mash/wm/bridge/wm_globals_mus.cc
rename to ash/mus/bridge/wm_globals_mus.cc
index a126ef78b1ab12531f96bee9a9e9b132986a14f3..fc7249a06f1d53e3bdfc0cd826c70c7f593afab7 100644
--- a/mash/wm/bridge/wm_globals_mus.cc
+++ b/ash/mus/bridge/wm_globals_mus.cc
@@ -2,26 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/bridge/wm_globals_mus.h"
+#include "ash/mus/bridge/wm_globals_mus.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/wm_activation_observer.h"
+#include "ash/mus/bridge/wm_root_window_controller_mus.h"
+#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/container_ids.h"
+#include "ash/mus/drag_window_resizer.h"
+#include "ash/mus/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_client.h"
-#include "mash/wm/bridge/wm_root_window_controller_mus.h"
-#include "mash/wm/bridge/wm_window_mus.h"
-#include "mash/wm/container_ids.h"
-#include "mash/wm/drag_window_resizer.h"
-#include "mash/wm/root_window_controller.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
-WmGlobalsMus::WmGlobalsMus(mus::WindowTreeClient* client)
-    : client_(client) {
+WmGlobalsMus::WmGlobalsMus(::mus::WindowTreeClient* client) : client_(client) {
   client_->AddObserver(this);
   WmGlobals::Set(this);
 }
@@ -33,7 +32,7 @@ WmGlobalsMus::~WmGlobalsMus() {
 
 // static
 WmGlobalsMus* WmGlobalsMus::Get() {
-  return static_cast<WmGlobalsMus*>(ash::wm::WmGlobals::Get());
+  return static_cast<WmGlobalsMus*>(wm::WmGlobals::Get());
 }
 
 void WmGlobalsMus::AddRootWindowController(
@@ -50,7 +49,7 @@ void WmGlobalsMus::RemoveRootWindowController(
 }
 
 // static
-WmWindowMus* WmGlobalsMus::GetToplevelAncestor(mus::Window* window) {
+WmWindowMus* WmGlobalsMus::GetToplevelAncestor(::mus::Window* window) {
   while (window) {
     if (IsActivationParent(window->parent()))
       return WmWindowMus::Get(window);
@@ -70,39 +69,39 @@ WmRootWindowControllerMus* WmGlobalsMus::GetRootWindowControllerWithDisplayId(
   return nullptr;
 }
 
-ash::wm::WmWindow* WmGlobalsMus::NewContainerWindow() {
+wm::WmWindow* WmGlobalsMus::NewContainerWindow() {
   return WmWindowMus::Get(client_->NewWindow());
 }
 
-ash::wm::WmWindow* WmGlobalsMus::GetFocusedWindow() {
+wm::WmWindow* WmGlobalsMus::GetFocusedWindow() {
   return WmWindowMus::Get(client_->GetFocusedWindow());
 }
 
-ash::wm::WmWindow* WmGlobalsMus::GetActiveWindow() {
+wm::WmWindow* WmGlobalsMus::GetActiveWindow() {
   return GetToplevelAncestor(client_->GetFocusedWindow());
 }
 
-ash::wm::WmWindow* WmGlobalsMus::GetPrimaryRootWindow() {
+wm::WmWindow* WmGlobalsMus::GetPrimaryRootWindow() {
   return root_window_controllers_[0]->GetWindow();
 }
 
-ash::wm::WmWindow* WmGlobalsMus::GetRootWindowForDisplayId(int64_t display_id) {
+wm::WmWindow* WmGlobalsMus::GetRootWindowForDisplayId(int64_t display_id) {
   return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
 }
 
-ash::wm::WmWindow* WmGlobalsMus::GetRootWindowForNewWindows() {
+wm::WmWindow* WmGlobalsMus::GetRootWindowForNewWindows() {
   NOTIMPLEMENTED();
   return root_window_controllers_[0]->GetWindow();
 }
 
-std::vector<ash::wm::WmWindow*> WmGlobalsMus::GetMruWindowList() {
+std::vector<wm::WmWindow*> WmGlobalsMus::GetMruWindowList() {
   NOTIMPLEMENTED();
-  return std::vector<ash::wm::WmWindow*>();
+  return std::vector<wm::WmWindow*>();
 }
 
-std::vector<ash::wm::WmWindow*> WmGlobalsMus::GetMruWindowListIgnoreModals() {
+std::vector<wm::WmWindow*> WmGlobalsMus::GetMruWindowListIgnoreModals() {
   NOTIMPLEMENTED();
-  return std::vector<ash::wm::WmWindow*>();
+  return std::vector<wm::WmWindow*>();
 }
 
 bool WmGlobalsMus::IsForceMaximizeOnFirstRun() {
@@ -128,21 +127,20 @@ void WmGlobalsMus::UnlockCursor() {
   NOTIMPLEMENTED();
 }
 
-std::vector<ash::wm::WmWindow*> WmGlobalsMus::GetAllRootWindows() {
-  std::vector<ash::wm::WmWindow*> wm_windows(root_window_controllers_.size());
+std::vector<wm::WmWindow*> WmGlobalsMus::GetAllRootWindows() {
+  std::vector<wm::WmWindow*> wm_windows(root_window_controllers_.size());
   for (size_t i = 0; i < root_window_controllers_.size(); ++i)
     wm_windows[i] = root_window_controllers_[i]->GetWindow();
   return wm_windows;
 }
 
-void WmGlobalsMus::RecordUserMetricsAction(
-    ash::wm::WmUserMetricsAction action) {
+void WmGlobalsMus::RecordUserMetricsAction(wm::WmUserMetricsAction action) {
   NOTIMPLEMENTED();
 }
 
-std::unique_ptr<ash::WindowResizer> WmGlobalsMus::CreateDragWindowResizer(
-    std::unique_ptr<ash::WindowResizer> next_window_resizer,
-    ash::wm::WindowState* window_state) {
+std::unique_ptr<WindowResizer> WmGlobalsMus::CreateDragWindowResizer(
+    std::unique_ptr<WindowResizer> next_window_resizer,
+    wm::WindowState* window_state) {
   return base::WrapUnique(
       new DragWindowResizer(std::move(next_window_resizer), window_state));
 }
@@ -157,36 +155,35 @@ bool WmGlobalsMus::IsOverviewModeRestoringMinimizedWindows() {
   return false;
 }
 
-void WmGlobalsMus::AddActivationObserver(
-    ash::wm::WmActivationObserver* observer) {
+void WmGlobalsMus::AddActivationObserver(wm::WmActivationObserver* observer) {
   activation_observers_.AddObserver(observer);
 }
 
 void WmGlobalsMus::RemoveActivationObserver(
-    ash::wm::WmActivationObserver* observer) {
+    wm::WmActivationObserver* observer) {
   activation_observers_.RemoveObserver(observer);
 }
 
-void WmGlobalsMus::AddDisplayObserver(ash::wm::WmDisplayObserver* observer) {
+void WmGlobalsMus::AddDisplayObserver(wm::WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
-void WmGlobalsMus::RemoveDisplayObserver(ash::wm::WmDisplayObserver* observer) {
+void WmGlobalsMus::RemoveDisplayObserver(wm::WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void WmGlobalsMus::AddOverviewModeObserver(
-    ash::wm::WmOverviewModeObserver* observer) {
+    wm::WmOverviewModeObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void WmGlobalsMus::RemoveOverviewModeObserver(
-    ash::wm::WmOverviewModeObserver* observer) {
+    wm::WmOverviewModeObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 // static
-bool WmGlobalsMus::IsActivationParent(mus::Window* window) {
+bool WmGlobalsMus::IsActivationParent(::mus::Window* window) {
   if (!window)
     return false;
 
@@ -206,22 +203,21 @@ void WmGlobalsMus::RemoveClientObserver() {
 }
 
 // TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
-void WmGlobalsMus::OnWindowTreeFocusChanged(mus::Window* gained_focus,
-                                            mus::Window* lost_focus) {
+void WmGlobalsMus::OnWindowTreeFocusChanged(::mus::Window* gained_focus,
+                                            ::mus::Window* lost_focus) {
   WmWindowMus* gained_active = GetToplevelAncestor(gained_focus);
   WmWindowMus* lost_active = GetToplevelAncestor(gained_focus);
   if (gained_active == lost_active)
     return;
 
-  FOR_EACH_OBSERVER(ash::wm::WmActivationObserver, activation_observers_,
+  FOR_EACH_OBSERVER(wm::WmActivationObserver, activation_observers_,
                     OnWindowActivated(gained_active, lost_active));
 }
 
-void WmGlobalsMus::OnWillDestroyClient(
-    mus::WindowTreeClient* client) {
+void WmGlobalsMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash