Removes the grid from ash.

ash/wm/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_WINDOW_RESIZER_H_
 #define ASH_WM_WINDOW_RESIZER_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "ui/gfx/rect.h"
@@ skipping 18 matching lines @@
   static const int kBoundsChangeDirection_None;
   static const int kBoundsChangeDirection_Horizontal;
   static const int kBoundsChangeDirection_Vertical;
 
   WindowResizer();
   virtual ~WindowResizer();
 
   // Returns a bitmask of the kBoundsChange_ values.
   static int GetBoundsChangeForWindowComponent(int component);
 
-  // Returns a location >= |location| that is aligned to fall on increments of
-  // |grid_size|.
-  static int AlignToGrid(int location, int grid_size);
-
-  // Variant of AlignToGrid that rounds up.
-  static int AlignToGridRoundUp(int location, int grid_size);
-
-  // Variant of AlignToGrid that rounds down.
-  static int AlignToGridRoundDown(int location, int grid_size);
-
   // Invoked to drag/move/resize the window. |location| is in the coordinates
   // of the window supplied to the constructor. |event_flags| is the event
   // flags from the event.
   virtual void Drag(const gfx::Point& location, int event_flags) = 0;
 
   // Invoked to complete the drag.
   virtual void CompleteDrag(int event_flags) = 0;
 
   // Reverts the drag.
   virtual void RevertDrag() = 0;
@@ skipping 30 matching lines @@
     // Bitmask of the |kBoundsChangeDirection_| constants.
     int position_change_direction;
 
     // Bitmask of the |kBoundsChangeDirection_| constants.
     int size_change_direction;
 
     // Will the drag actually modify the window?
     bool is_resizable;
   };
 
-  static gfx::Rect CalculateBoundsForDrag(
-      const Details& details,
-      const gfx::Point& location,
-      int grid_size);
+  static gfx::Rect CalculateBoundsForDrag(const Details& details,
+                                          const gfx::Point& location);
 
   static gfx::Rect AdjustBoundsToGrid(const gfx::Rect& bounds,
                                       int grid_size);
 
   static bool IsBottomEdge(int component);
 
  private:
   // Returns the new origin of the window. The arguments are the difference
   // between the current location and the initial location.
   static gfx::Point GetOriginForDrag(const Details& details,
                                      int delta_x,
                                      int delta_y);
 
   // Returns the size of the window for the drag.
   static gfx::Size GetSizeForDrag(const Details& details,
                                   int* delta_x,
-                                  int* delta_y,
-                                  int grid_size);
+                                  int* delta_y);
 
   // Returns the width of the window.
   static int GetWidthForDrag(const Details& details,
                              int min_width,
-                             int* delta_x,
-                             int grid_size);
+                             int* delta_x);
 
   // Returns the height of the drag.
   static int GetHeightForDrag(const Details& details,
                               int min_height,
-                              int* delta_y,
-                              int grid_size);
+                              int* delta_y);
 };
 
 }  // namespace aura
 
 #endif  // ASH_WM_WINDOW_RESIZER_H_