Removes the grid from ash.

ash/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_WM_WORKSPACE_WINDOW_RESIZER_H_
 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
 
 #include <vector>
 
 #include "ash/wm/window_resizer.h"
@@ skipping 24 matching lines @@
  public:
   // When dragging an attached window this is the min size we'll make sure is
   // visible. In the vertical direction we take the max of this and that from
   // the delegate.
   static const int kMinOnscreenSize;
 
   // Min height we'll force on screen when dragging the caption.
   // TODO: this should come from a property on the window.
   static const int kMinOnscreenHeight;
 
+  // Snap region when dragging close to the edges. That is, as the window gets
+  // this close to an edge of the screen it snaps to the edge.
+  static const int kScreenEdgeInset;
+
   virtual ~WorkspaceWindowResizer();
 
   static WorkspaceWindowResizer* Create(
       aura::Window* window,
       const gfx::Point& location_in_parent,
       int window_component,
       const std::vector<aura::Window*>& attached_windows);
 
   // Returns true if the drag will result in changing the window in anyway.
   bool is_resizable() const { return details_.is_resizable; }
@@ skipping 19 matching lines @@
   enum SnapType {
     // Snap to the left/right edge of the screen.
     SNAP_LEFT_EDGE,
     SNAP_RIGHT_EDGE,
 
     // No snap position.
     SNAP_NONE
   };
 
   // Returns the final bounds to place the window at. This differs from
-  // the current if there is a grid.
-  gfx::Rect GetFinalBounds(const gfx::Rect& bounds, int grid_size) const;
+  // the current when snapping.
+  gfx::Rect GetFinalBounds(const gfx::Rect& bounds) const;
 
   // Lays out the attached windows. |bounds| is the bounds of the main window.
-  void LayoutAttachedWindows(const gfx::Rect& bounds, int grid_size);
+  void LayoutAttachedWindows(const gfx::Rect& bounds);
 
   // Calculates the size (along the primary axis) of the attached windows.
   // |initial_size| is the initial size of the main window, |current_size| the
   // new size of the main window, |start| the position to layout the attached
   // windows from and |end| the coordinate to position to.
-  void CalculateAttachedSizes(
-      int initial_size,
-      int current_size,
-      int start,
-      int end,
-      int grid_size,
-      std::vector<int>* sizes) const;
+  void CalculateAttachedSizes(int initial_size,
+                              int current_size,
+                              int start,
+                              int end,
+                              std::vector<int>* sizes) const;
 
   // Adjusts the bounds to enforce that windows are vertically contained in the
   // work area.
   void AdjustBoundsForMainWindow(gfx::Rect* bounds, int grid_size) const;
 
   // Snaps the window bounds to the work area edges if necessary.
   void SnapToWorkAreaEdges(
       const gfx::Rect& work_area,
       gfx::Rect* bounds,
       int grid_size) const;
 
   // Returns true if the window touches the bottom edge of the work area.
   bool TouchesBottomOfScreen() const;
 
   // Returns a coordinate along the primary axis. Used to share code for
   // left/right multi window resize and top/bottom resize.
   int PrimaryAxisSize(const gfx::Size& size) const;
   int PrimaryAxisCoordinate(int x, int y) const;
 
   // Updates the bounds of the phantom window for window snapping.
   void UpdateSnapPhantomWindow(const gfx::Point& location,
-                               const gfx::Rect& bounds,
-                               int grid_size);
+                               const gfx::Rect& bounds);
 
   // Updates the bounds of the phantom window for window dragging. Set true on
   // |in_original_root| if the pointer is still in |window()->GetRootWindow()|.
   void UpdateDragPhantomWindow(const gfx::Rect& bounds, bool in_original_root);
 
   // Restacks the windows z-order position so that one of the windows is at the
   // top of the z-order, and the rest directly underneath it.
   void RestackWindows();
 
   // Returns the SnapType for the specified point. SNAP_NONE is used if no
@@ skipping 68 matching lines @@
   // been deleted.
   bool* destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_