Shuffles and renames ash/common/wm classes

ash/aura/wm_root_window_controller_aura.h

Index: ash/aura/wm_root_window_controller_aura.h
diff --git a/ash/wm/aura/wm_root_window_controller_aura.h b/ash/aura/wm_root_window_controller_aura.h
similarity index 84%
rename from ash/wm/aura/wm_root_window_controller_aura.h
rename to ash/aura/wm_root_window_controller_aura.h
index 9164f99f780401e0dff2b278cc692691c9bba07a..0b439251dc3d8f0c1e80e4e4c5ef630b5847bd2c 100644
--- a/ash/wm/aura/wm_root_window_controller_aura.h
+++ b/ash/aura/wm_root_window_controller_aura.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_AURA_WM_ROOT_CONTROLLER_AURA_H_
-#define ASH_WM_AURA_WM_ROOT_CONTROLLER_AURA_H_
+#ifndef ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
+#define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_root_window_controller.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ -19,8 +19,6 @@ namespace ash {
 
 class RootWindowController;
 
-namespace wm {
-
 class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
                                               public ShellObserver {
  public:
@@ -36,10 +34,10 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
 
   // WmRootWindowController:
   bool HasShelf() override;
-  WmGlobals* GetGlobals() override;
-  WorkspaceWindowState GetWorkspaceWindowState() override;
+  WmShell* GetShell() override;
+  wm::WorkspaceWindowState GetWorkspaceWindowState() override;
   AlwaysOnTopController* GetAlwaysOnTopController() override;
-  WmShelf* GetShelf() override;
+  wm::WmShelf* GetShelf() override;

[James Cook, 2016/06/03 20:10:46]

My patch to move the shelf code is going to collide with this. Unless you tell
me otherwise, I'll wait for you to land first, then rebase on top of you.

   WmWindow* GetWindow() override;
   void ConfigureWidgetInitParamsForContainer(
       views::Widget* widget,
@@ -62,7 +60,6 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
   DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura);
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_WM_AURA_WM_ROOT_CONTROLLER_AURA_H_
+#endif  // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_