Shuffles and renames ash/common/wm classes

ash/common/wm_root_window_controller.h

Index: ash/common/wm_root_window_controller.h
diff --git a/ash/common/wm/wm_root_window_controller.h b/ash/common/wm_root_window_controller.h
similarity index 83%
rename from ash/common/wm/wm_root_window_controller.h
rename to ash/common/wm_root_window_controller.h
index 0429440ad817e557000a35039845a112ae3982ce..cfcc8f3e781213155e98b10ff5a439e4508526a9 100644
--- a/ash/common/wm/wm_root_window_controller.h
+++ b/ash/common/wm_root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
-#define ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
+#define ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/workspace/workspace_types.h"
@@ -16,13 +16,13 @@ class Point;
 namespace ash {
 
 class AlwaysOnTopController;
+class WmShell;
+class WmRootWindowControllerObserver;
+class WmWindow;
 
 namespace wm {
-
-class WmGlobals;
-class WmRootWindowControllerObserver;
 class WmShelf;
-class WmWindow;
+}
 
 // Provides state associated with a root of a window hierarchy.
 class ASH_EXPORT WmRootWindowController {
@@ -31,13 +31,13 @@ class ASH_EXPORT WmRootWindowController {
 
   virtual bool HasShelf() = 0;
 
-  virtual WmGlobals* GetGlobals() = 0;
+  virtual WmShell* GetShell() = 0;
 
-  virtual WorkspaceWindowState GetWorkspaceWindowState() = 0;
+  virtual wm::WorkspaceWindowState GetWorkspaceWindowState() = 0;
 
   virtual AlwaysOnTopController* GetAlwaysOnTopController() = 0;
 
-  virtual WmShelf* GetShelf() = 0;
+  virtual wm::WmShelf* GetShelf() = 0;
 
   // Returns the window associated with this WmRootWindowController.
   virtual WmWindow* GetWindow() = 0;
@@ -60,7 +60,6 @@ class ASH_EXPORT WmRootWindowController {
   virtual void RemoveObserver(WmRootWindowControllerObserver* observer) = 0;
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_H_
+#endif  // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_