Removes the grid from ash.

chrome/browser/ui/ash/window_positioner.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 "chrome/browser/ui/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 // statics
 
-// Currently matches kGridSize * 2 (defined in ash/wm/workspace_controller.cc).
 const int WindowPositioner::kMinimumWindowOffset = 32;
 
 WindowPositioner::WindowPositioner()
     : pop_position_offset_increment_x(0),
       pop_position_offset_increment_y(0),
       popup_position_offset_from_screen_corner_x(0),
       popup_position_offset_from_screen_corner_y(0),
       last_popup_position_x_(0),
       last_popup_position_y_(0) {
 }
 
 WindowPositioner::~WindowPositioner() {
 }
 
 gfx::Rect WindowPositioner::GetPopupPosition(const gfx::Rect& old_pos) {
-  int grid = ash::Shell::GetInstance()->GetGridSize();
-  // Make sure that the grid has a minimum resolution.
-  if (!grid) {
-    grid = kMinimumWindowOffset;
-  } else {
-    while (grid < kMinimumWindowOffset)
-      grid *= 2;
-  }
+  int grid = kMinimumWindowOffset;
   popup_position_offset_from_screen_corner_x = grid;
   popup_position_offset_from_screen_corner_y = grid;
   if (!pop_position_offset_increment_x) {
     // When the popup position increment is , the last popup position
     // was not yet initialized.
     last_popup_position_x_ = popup_position_offset_from_screen_corner_x;
     last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
   }
   pop_position_offset_increment_x = grid;
   pop_position_offset_increment_y = grid;
@@ skipping 99 matching lines @@
     // Note: The passing (x,y,w,h) window is always relative to the work area's
     // origin.
     for (; x_increment > 0 ? (x < x_end) : (x > x_end); x += x_increment) {
       int y = 0;
       while (y + h <= work_area.height()) {
         size_t i;
         for (i = 0; i < regions.size(); i++) {
           if (regions[i]->Intersects(gfx::Rect(x + work_area.x(),
                                                y + work_area.y(), w, h))) {
             y = regions[i]->bottom() - work_area.y();
-            if (grid > 1) {
-              // Align to the (next) grid step.
-              y = ash::WindowResizer::AlignToGridRoundUp(y, grid);
-            }
             break;
           }
         }
         if (i >= regions.size())
           return gfx::Rect(x + work_area.x(), y + work_area.y(), w, h);
       }
     }
   }
   return gfx::Rect(0, 0, 0, 0);
 }
@@ skipping 13 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash