Moves mash/wm into ash/mus

ash/mus/bridge/wm_globals_mus.h

Index: ash/mus/bridge/wm_globals_mus.h
diff --git a/mash/wm/bridge/wm_globals_mus.h b/ash/mus/bridge/wm_globals_mus.h
similarity index 41%
rename from mash/wm/bridge/wm_globals_mus.h
rename to ash/mus/bridge/wm_globals_mus.h
index f1437f287ef70dc6dcb2c200306155636a18d6b8..dbc21cafb693b930423c4df921bdba75af9fd20b 100644
--- a/mash/wm/bridge/wm_globals_mus.h
+++ b/ash/mus/bridge/wm_globals_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_GLOBALS_MUS_H_
-#define MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
+#ifndef ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_
+#define ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_
 
 #include <stdint.h>
 
@@ -18,17 +18,17 @@ namespace mus {
 class WindowTreeClient;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class WmRootWindowControllerMus;
 class WmWindowMus;
 
 // WmGlobals implementation for mus.
-class WmGlobalsMus : public ash::wm::WmGlobals,
-                     public mus::WindowTreeClientObserver {
+class WmGlobalsMus : public wm::WmGlobals,
+                     public ::mus::WindowTreeClientObserver {
  public:
-  explicit WmGlobalsMus(mus::WindowTreeClient* client);
+  explicit WmGlobalsMus(::mus::WindowTreeClient* client);
   ~WmGlobalsMus() override;
 
   static WmGlobalsMus* Get();
@@ -38,62 +38,60 @@ class WmGlobalsMus : public ash::wm::WmGlobals,
 
   // Returns the ancestor of |window| (including |window|) that is considered
   // toplevel. |window| may be null.
-  static WmWindowMus* GetToplevelAncestor(mus::Window* window);
+  static WmWindowMus* GetToplevelAncestor(::mus::Window* window);
 
   WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
 
   // WmGlobals:
-  ash::wm::WmWindow* NewContainerWindow() override;
-  ash::wm::WmWindow* GetFocusedWindow() override;
-  ash::wm::WmWindow* GetActiveWindow() override;
-  ash::wm::WmWindow* GetPrimaryRootWindow() override;
-  ash::wm::WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
-  ash::wm::WmWindow* GetRootWindowForNewWindows() override;
-  std::vector<ash::wm::WmWindow*> GetMruWindowList() override;
-  std::vector<ash::wm::WmWindow*> GetMruWindowListIgnoreModals() override;
+  wm::WmWindow* NewContainerWindow() override;
+  wm::WmWindow* GetFocusedWindow() override;
+  wm::WmWindow* GetActiveWindow() override;
+  wm::WmWindow* GetPrimaryRootWindow() override;
+  wm::WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
+  wm::WmWindow* GetRootWindowForNewWindows() override;
+  std::vector<wm::WmWindow*> GetMruWindowList() override;
+  std::vector<wm::WmWindow*> GetMruWindowListIgnoreModals() override;
   bool IsForceMaximizeOnFirstRun() override;
   bool IsUserSessionBlocked() override;
   bool IsScreenLocked() override;
   void LockCursor() override;
   void UnlockCursor() override;
-  std::vector<ash::wm::WmWindow*> GetAllRootWindows() override;
-  void RecordUserMetricsAction(ash::wm::WmUserMetricsAction action) override;
-  std::unique_ptr<ash::WindowResizer> CreateDragWindowResizer(
-      std::unique_ptr<ash::WindowResizer> next_window_resizer,
-      ash::wm::WindowState* window_state) override;
+  std::vector<wm::WmWindow*> GetAllRootWindows() override;
+  void RecordUserMetricsAction(wm::WmUserMetricsAction action) override;
+  std::unique_ptr<WindowResizer> CreateDragWindowResizer(
+      std::unique_ptr<WindowResizer> next_window_resizer,
+      wm::WindowState* window_state) override;
   bool IsOverviewModeSelecting() override;
   bool IsOverviewModeRestoringMinimizedWindows() override;
-  void AddActivationObserver(ash::wm::WmActivationObserver* observer) override;
-  void RemoveActivationObserver(
-      ash::wm::WmActivationObserver* observer) override;
-  void AddDisplayObserver(ash::wm::WmDisplayObserver* observer) override;
-  void RemoveDisplayObserver(ash::wm::WmDisplayObserver* observer) override;
-  void AddOverviewModeObserver(
-      ash::wm::WmOverviewModeObserver* observer) override;
+  void AddActivationObserver(wm::WmActivationObserver* observer) override;
+  void RemoveActivationObserver(wm::WmActivationObserver* observer) override;
+  void AddDisplayObserver(wm::WmDisplayObserver* observer) override;
+  void RemoveDisplayObserver(wm::WmDisplayObserver* observer) override;
+  void AddOverviewModeObserver(wm::WmOverviewModeObserver* observer) override;
   void RemoveOverviewModeObserver(
-      ash::wm::WmOverviewModeObserver* observer) override;
+      wm::WmOverviewModeObserver* observer) override;
 
  private:
   // Returns true if |window| is a window that can have active children.
-  static bool IsActivationParent(mus::Window* window);
+  static bool IsActivationParent(::mus::Window* window);
 
   void RemoveClientObserver();
 
-  // mus::WindowTreeClientObserver:
-  void OnWindowTreeFocusChanged(mus::Window* gained_focus,
-                                mus::Window* lost_focus) override;
-  void OnWillDestroyClient(mus::WindowTreeClient* client) override;
+  // ::mus::WindowTreeClientObserver:
+  void OnWindowTreeFocusChanged(::mus::Window* gained_focus,
+                                ::mus::Window* lost_focus) override;
+  void OnWillDestroyClient(::mus::WindowTreeClient* client) override;
 
-  mus::WindowTreeClient* client_;
+  ::mus::WindowTreeClient* client_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
-  base::ObserverList<ash::wm::WmActivationObserver> activation_observers_;
+  base::ObserverList<wm::WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmGlobalsMus);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
+#endif  // ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_