Shuffles and renames ash/common/wm classes

ash/mus/bridge/wm_shell_mus.h

Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_globals_mus.h b/ash/mus/bridge/wm_shell_mus.h
similarity index 57%
rename from ash/mus/bridge/wm_globals_mus.h
rename to ash/mus/bridge/wm_shell_mus.h
index dbc21cafb693b930423c4df921bdba75af9fd20b..f03ddd86405ea35987178dda453383ad8c7fee59 100644
--- a/ash/mus/bridge/wm_globals_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_
-#define ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_
+#ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
+#define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <vector>
 
-#include "ash/common/wm/wm_globals.h"
+#include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/mus/public/cpp/window_tree_client_observer.h"
@@ -24,14 +24,13 @@ namespace mus {
 class WmRootWindowControllerMus;
 class WmWindowMus;
 
-// WmGlobals implementation for mus.
-class WmGlobalsMus : public wm::WmGlobals,
-                     public ::mus::WindowTreeClientObserver {
+// WmShell implementation for mus.
+class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
  public:
-  explicit WmGlobalsMus(::mus::WindowTreeClient* client);
-  ~WmGlobalsMus() override;
+  explicit WmShellMus(::mus::WindowTreeClient* client);
+  ~WmShellMus() override;
 
-  static WmGlobalsMus* Get();
+  static WmShellMus* Get();
 
   void AddRootWindowController(WmRootWindowControllerMus* controller);
   void RemoveRootWindowController(WmRootWindowControllerMus* controller);
@@ -42,34 +41,33 @@ class WmGlobalsMus : public wm::WmGlobals,
 
   WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
 
-  // WmGlobals:
-  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;
+  // WmShell:
+  WmWindow* NewContainerWindow() override;
+  WmWindow* GetFocusedWindow() override;
+  WmWindow* GetActiveWindow() override;
+  WmWindow* GetPrimaryRootWindow() override;
+  WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
+  WmWindow* GetRootWindowForNewWindows() override;
+  std::vector<WmWindow*> GetMruWindowList() override;
+  std::vector<WmWindow*> GetMruWindowListIgnoreModals() override;
   bool IsForceMaximizeOnFirstRun() override;
   bool IsUserSessionBlocked() override;
   bool IsScreenLocked() override;
   void LockCursor() override;
   void UnlockCursor() override;
-  std::vector<wm::WmWindow*> GetAllRootWindows() override;
+  std::vector<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(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(
-      wm::WmOverviewModeObserver* observer) override;
+  void AddActivationObserver(WmActivationObserver* observer) override;
+  void RemoveActivationObserver(WmActivationObserver* observer) override;
+  void AddDisplayObserver(WmDisplayObserver* observer) override;
+  void RemoveDisplayObserver(WmDisplayObserver* observer) override;
+  void AddOverviewModeObserver(WmOverviewModeObserver* observer) override;
+  void RemoveOverviewModeObserver(WmOverviewModeObserver* observer) override;
 
  private:
   // Returns true if |window| is a window that can have active children.
@@ -86,12 +84,12 @@ class WmGlobalsMus : public wm::WmGlobals,
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
-  base::ObserverList<wm::WmActivationObserver> activation_observers_;
+  base::ObserverList<WmActivationObserver> activation_observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmGlobalsMus);
+  DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
-#endif  // ASH_MUS_BRIDGE_WM_GLOBALS_MUS_H_
+#endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_