Moves mash/wm into ash/mus

ash/mus/bridge/wm_root_window_controller_mus.h

Index: ash/mus/bridge/wm_root_window_controller_mus.h
diff --git a/mash/wm/bridge/wm_root_window_controller_mus.h b/ash/mus/bridge/wm_root_window_controller_mus.h
similarity index 58%
rename from mash/wm/bridge/wm_root_window_controller_mus.h
rename to ash/mus/bridge/wm_root_window_controller_mus.h
index 2702686189e2df0ceee074b2f3cc1134b3f0883e..a9da712d79ed023a273f06a3ec9188d09e1da9b5 100644
--- a/mash/wm/bridge/wm_root_window_controller_mus.h
+++ b/ash/mus/bridge/wm_root_window_controller_mus.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
-#define MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
+#ifndef ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
+#define ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
 
 #include "ash/common/wm/wm_root_window_controller.h"
 #include "base/macros.h"
@@ -17,25 +17,25 @@ namespace mus {
 class Window;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class RootWindowController;
 class WmGlobalsMus;
 class WmWindowMus;
 
 // WmRootWindowController implementations for mus.
-class WmRootWindowControllerMus : public ash::wm::WmRootWindowController {
+class WmRootWindowControllerMus : public wm::WmRootWindowController {
  public:
   WmRootWindowControllerMus(WmGlobalsMus* globals,
                             RootWindowController* root_window_controller);
   ~WmRootWindowControllerMus() override;
 
-  static WmRootWindowControllerMus* Get(mus::Window* window) {
+  static WmRootWindowControllerMus* Get(::mus::Window* window) {
     return const_cast<WmRootWindowControllerMus*>(
-        Get(const_cast<const mus::Window*>(window)));
+        Get(const_cast<const ::mus::Window*>(window)));
   }
-  static const WmRootWindowControllerMus* Get(const mus::Window* window);
+  static const WmRootWindowControllerMus* Get(const ::mus::Window* window);
 
   RootWindowController* root_window_controller() {
     return root_window_controller_;
@@ -53,30 +53,28 @@ class WmRootWindowControllerMus : public ash::wm::WmRootWindowController {
 
   // WmRootWindowController:
   bool HasShelf() override;
-  ash::wm::WmGlobals* GetGlobals() override;
-  ash::wm::WorkspaceWindowState GetWorkspaceWindowState() override;
-  ash::AlwaysOnTopController* GetAlwaysOnTopController() override;
-  ash::wm::WmShelf* GetShelf() override;
-  ash::wm::WmWindow* GetWindow() override;
+  wm::WmGlobals* GetGlobals() override;
+  wm::WorkspaceWindowState GetWorkspaceWindowState() override;
+  AlwaysOnTopController* GetAlwaysOnTopController() override;
+  wm::WmShelf* GetShelf() override;
+  wm::WmWindow* GetWindow() override;
   void ConfigureWidgetInitParamsForContainer(
       views::Widget* widget,
       int shell_container_id,
       views::Widget::InitParams* init_params) override;
-  ash::wm::WmWindow* FindEventTarget(
-      const gfx::Point& location_in_screen) override;
-  void AddObserver(ash::wm::WmRootWindowControllerObserver* observer) override;
-  void RemoveObserver(
-      ash::wm::WmRootWindowControllerObserver* observer) override;
+  wm::WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
+  void AddObserver(wm::WmRootWindowControllerObserver* observer) override;
+  void RemoveObserver(wm::WmRootWindowControllerObserver* observer) override;
 
  private:
   WmGlobalsMus* globals_;
   RootWindowController* root_window_controller_;
-  base::ObserverList<ash::wm::WmRootWindowControllerObserver> observers_;
+  base::ObserverList<wm::WmRootWindowControllerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
+#endif  // ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_