Removes the grid from ash.

ash/wm/workspace/snap_sizer.cc

 // 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.
 
 #include "ash/wm/workspace/snap_sizer.h"
 
 #include <cmath>
 
 #include "ash/screen_ash.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 20 matching lines @@
 const int kPixelsBeforeAdjust = 100;
 
 // When the smallest resolution does not fit on the screen, we take this
 // fraction of the available space.
 const int kMinimumScreenPercent = 90;
 
 }  // namespace
 
 SnapSizer::SnapSizer(aura::Window* window,
                      const gfx::Point& start,
-                     Edge edge,
-                     int grid_size)
+                     Edge edge)
     : window_(window),
       edge_(edge),
-      grid_size_(grid_size),
       time_last_update_(base::TimeTicks::Now()),
       size_index_(0),
       resize_disabled_(false),
       num_moves_since_adjust_(0),
       last_adjust_x_(start.x()),
       last_update_x_(start.x()) {
   target_bounds_ = GetTargetBounds();
 }
 
 void SnapSizer::Update(const gfx::Point& location) {
@@ skipping 30 matching lines @@
 }
 
 void SnapSizer::SelectDefaultSizeAndDisableResize() {
   resize_disabled_ = true;
   size_index_ = 0;
   target_bounds_ = GetTargetBounds();
 }
 
 gfx::Rect SnapSizer::GetTargetBoundsForSize(size_t size_index) const {
   gfx::Rect work_area(ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(window_));
-  int y = WindowResizer::AlignToGridRoundUp(work_area.y(), grid_size_);
+  int y = work_area.y();
   // We don't align to the bottom of the grid as the launcher may not
   // necessarily align to the grid (happens when auto-hidden).
   int max_y = work_area.bottom();
   int width = kSizes[size_index];
   if (resize_disabled_) {
     width = std::max(1024, work_area.width() / 2);
   } else {
     while (width >= work_area.width()) {
       if (size_index >= arraysize(kSizes))
         break;
       width = kSizes[++size_index];
     }
   }
 
   // Make sure that we keep the size of the window smaller then a certain
   // fraction of the screen space.
   width = std::min(width, kMinimumScreenPercent * work_area.width() / 100);
 
   if (edge_ == LEFT_EDGE) {
-    int x = WindowResizer::AlignToGridRoundUp(work_area.x(), grid_size_);
-    int mid_x = WindowResizer::AlignToGridRoundUp(
-        work_area.x() + width, grid_size_);
+    int x = work_area.x();
+    int mid_x = x + width;
     return gfx::Rect(x, y, mid_x - x, max_y - y);
   }
-  int max_x =
-      WindowResizer::AlignToGridRoundDown(work_area.right(), grid_size_);
-  int x = WindowResizer::AlignToGridRoundUp(max_x - width, grid_size_);
+  int max_x = work_area.right();
+  int x = max_x - width;
   return gfx::Rect(x , y, max_x - x, max_y - y);
 }
 
 int SnapSizer::CalculateIncrement(int x, int reference_x) const {
   if (AlongEdge(x))
     return 1;
   if (x == reference_x)
     return 0;
   if (edge_ == LEFT_EDGE) {
     if (x < reference_x)
@@ skipping 21 matching lines @@
   return GetTargetBoundsForSize(size_index_);
 }
 
 bool SnapSizer::AlongEdge(int x) const {
   gfx::Rect area(ScreenAsh::GetDisplayBoundsInParent(window_));
   return (x <= area.x()) || (x >= area.right() - 1);
 }
 
 }  // namespace internal
 }  // namespace ash