Shuffles and renames ash/common/wm classes

ash/common/wm/window_positioner.h

Index: ash/common/wm/window_positioner.h
diff --git a/ash/common/wm/window_positioner.h b/ash/common/wm/window_positioner.h
index 1598626466ecbe5ef310eae67db3cad277ba8d12..85cdfd614278e3b950bcb4a8bb4ed4b012087c0f 100644
--- a/ash/common/wm/window_positioner.h
+++ b/ash/common/wm/window_positioner.h
@@ -18,10 +18,9 @@ class Rect;
 }
 
 namespace ash {
-namespace wm {
-class WmGlobals;
+
+class WmShell;
 class WmWindow;
-}
 
 namespace test {
 class WindowPositionerTest;
@@ -50,7 +49,7 @@ class ASH_EXPORT WindowPositioner {
   // |is_saved_bounds| indicates the |bounds_in_out| is the saved
   // bounds.
   static void GetBoundsAndShowStateForNewWindow(
-      const wm::WmWindow* new_window,
+      const WmWindow* new_window,
       bool is_saved_bounds,
       ui::WindowShowState show_state_in,
       gfx::Rect* bounds_in_out,
@@ -63,7 +62,7 @@ class ASH_EXPORT WindowPositioner {
   // automated desktop location management can be performed and
   // rearrange accordingly.
   static void RearrangeVisibleWindowOnHideOrRemove(
-      const wm::WmWindow* removed_window);
+      const WmWindow* removed_window);
 
   // Turn the automatic positioning logic temporarily off. Returns the previous
   // state.
@@ -72,9 +71,9 @@ class ASH_EXPORT WindowPositioner {
   // Check if after insertion or showing of the given |added_window|
   // an automated desktop location management can be performed and
   // rearrange accordingly.
-  static void RearrangeVisibleWindowOnShow(wm::WmWindow* added_window);
+  static void RearrangeVisibleWindowOnShow(WmWindow* added_window);
 
-  explicit WindowPositioner(wm::WmGlobals* globals);
+  explicit WindowPositioner(WmShell* shell);
   ~WindowPositioner();
 
   // Find a suitable screen position for a popup window and return it. The
@@ -109,7 +108,7 @@ class ASH_EXPORT WindowPositioner {
   // Constant exposed for unittest.
   static const int kMinimumWindowOffset;
 
-  wm::WmGlobals* globals_;
+  WmShell* shell_;
 
   // The offset in X and Y for the next popup which opens.
   int pop_position_offset_increment_x;