Shuffles and renames ash/common/wm classes

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm/wm_globals.h b/ash/common/wm_shell.h
similarity index 88%
rename from ash/common/wm/wm_globals.h
rename to ash/common/wm_shell.h
index c0ac5ee1e760e4070bf65ec3dc114c7859caa3b2..fd582f5bb6a81c7afeaf0b620d2e255a9dfd8100 100644
--- a/ash/common/wm/wm_globals.h
+++ b/ash/common/wm_shell.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 ASH_COMMON_WM_WM_GLOBALS_H_
-#define ASH_COMMON_WM_WM_GLOBALS_H_
+#ifndef ASH_COMMON_WM_SHELL_H_
+#define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
@@ -19,26 +19,27 @@ class Rect;
 namespace ash {
 
 class WindowResizer;
-
-namespace wm {
-
-class WindowState;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmOverviewModeObserver;
 class WmWindow;
 
+namespace wm {
+
+class WindowState;
+
 enum class WmUserMetricsAction;
+}
 
-// Used for accessing global state.
-class ASH_EXPORT WmGlobals {
+// Similar to ash::Shell. Eventually the two will be merged.
+class ASH_EXPORT WmShell {
  public:
-  virtual ~WmGlobals() {}
+  virtual ~WmShell() {}
 
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
-  static void Set(WmGlobals* instance);
-  static WmGlobals* Get();
+  static void Set(WmShell* instance);
+  static WmShell* Get();
 
   // Creates a new window used as a container of other windows. No painting is
   // done to the created window.
@@ -77,7 +78,7 @@ class ASH_EXPORT WmGlobals {
 
   virtual std::vector<WmWindow*> GetAllRootWindows() = 0;
 
-  virtual void RecordUserMetricsAction(WmUserMetricsAction action) = 0;
+  virtual void RecordUserMetricsAction(wm::WmUserMetricsAction action) = 0;
 
   // Returns a WindowResizer to handle dragging. |next_window_resizer| is
   // the next WindowResizer in the WindowResizer chain. This may return
@@ -101,10 +102,9 @@ class ASH_EXPORT WmGlobals {
   virtual void RemoveOverviewModeObserver(WmOverviewModeObserver* observer) = 0;
 
  private:
-  static WmGlobals* instance_;
+  static WmShell* instance_;
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_WM_GLOBALS_H_
+#endif  // ASH_COMMON_WM_SHELL_H_