Shuffles and renames ash/common/wm classes

ash/common/wm/workspace/workspace_window_resizer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
 #define ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/wm/window_resizer.h"
-#include "ash/common/wm/wm_window_tracker.h"
 #include "ash/common/wm/workspace/magnetism_matcher.h"
+#include "ash/common/wm_window_tracker.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
 namespace ash {
 class DockedWindowLayoutManager;
 class PhantomWindowController;
 class TwoStepEdgeCycler;
 class WindowSize;
 
 namespace wm {
 class WindowState;
-class WmGlobals;
+class WmShell;
 }
 
 // WindowResizer implementation for workspaces. This enforces that windows are
 // not allowed to vertically move or resize outside of the work area. As windows
 // are moved outside the work area they are shrunk. We remember the height of
 // the window before it was moved so that if the window is again moved up we
 // attempt to restore the old height.
 class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
  public:
   // When dragging an attached window this is the min size we'll make sure is
@@ skipping 10 matching lines @@
   static const int kScreenEdgeInset;
 
   // Distance in pixels that the cursor must move past an edge for a window
   // to move or resize beyond that edge.
   static const int kStickyDistancePixels;
 
   ~WorkspaceWindowResizer() override;
 
   static WorkspaceWindowResizer* Create(
       wm::WindowState* window_state,
-      const std::vector<wm::WmWindow*>& attached_windows);
+      const std::vector<WmWindow*>& attached_windows);
 
   // WindowResizer:
   void Drag(const gfx::Point& location_in_parent, int event_flags) override;
   void CompleteDrag() override;
   void RevertDrag() override;
 
  private:
   friend class WorkspaceWindowResizerTest;
 
   // The edge to which the window should be snapped at the end of the drag.
   enum SnapType { SNAP_LEFT, SNAP_RIGHT, SNAP_NONE };
 
   WorkspaceWindowResizer(wm::WindowState* window_state,
-                         const std::vector<wm::WmWindow*>& attached_windows);
+                         const std::vector<WmWindow*>& attached_windows);
 
   // Lays out the attached windows. |bounds| is the bounds of the main window.
   void LayoutAttachedWindows(gfx::Rect* bounds);
 
   // Calculates the new sizes of the attached windows, given that the main
   // window has been resized (along the primary axis) by |delta|.
   // |available_size| is the maximum length of the space that the attached
   // windows are allowed to occupy (ie: the distance between the right/bottom
   // edge of the primary window and the right/bottom of the desktop area).
   // Populates |sizes| with the desired sizes of the attached windows, and
@@ skipping 70 matching lines @@
   // Returns true if |bounds_in_parent| are valid bounds for snapped state type
   // |snapped_type|.
   bool AreBoundsValidSnappedBounds(wm::WindowStateType snapped_type,
                                    const gfx::Rect& bounds_in_parent) const;
 
   // Docks or undocks the dragged window.
   void SetDraggedWindowDocked(bool should_dock);
 
   wm::WindowState* window_state() { return window_state_; }
 
-  const std::vector<wm::WmWindow*> attached_windows_;
+  const std::vector<WmWindow*> attached_windows_;
 
-  wm::WmGlobals* globals_;
+  WmShell* shell_;
 
   // Returns the currently used instance for test.
   static WorkspaceWindowResizer* GetInstanceForTest();
 
   bool did_lock_cursor_;
 
   // Set to true once Drag() is invoked and the bounds of the window change.
   bool did_move_or_resize_;
 
   // True if the window initially had |bounds_changed_by_user_| set in state.
@@ skipping 22 matching lines @@
 
   // Number of mouse moves since the last bounds change. Only used for phantom
   // placement to track when the mouse is moved while pushed against the edge of
   // the screen.
   int num_mouse_moves_since_bounds_change_;
 
   // The mouse location passed to Drag().
   gfx::Point last_mouse_location_;
 
   // Window the drag has magnetically attached to.
-  wm::WmWindow* magnetism_window_;
+  WmWindow* magnetism_window_;
 
   // Used to verify |magnetism_window_| is still valid.
-  wm::WmWindowTracker window_tracker_;
+  WmWindowTracker window_tracker_;
 
   // If |magnetism_window_| is non-NULL this indicates how the two windows
   // should attach.
   MatchedEdge magnetism_edge_;
 
   // Dock container window layout manager.
   DockedWindowLayoutManager* dock_layout_;
 
   // Used to determine if this has been deleted during a drag such as when a tab
   // gets dragged into another browser window.
   base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_