Ignoring alignment when it pushes a window out of the screen

chrome/browser/ui/views/ash/window_positioner_unittest.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/views/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 10 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
+// A function which aligns a size to a step within the grid.
+int align(int size, int alignment_factor) {
+  if (alignment_factor > 1) {
+    return size - size % alignment_factor;
+  }
+  return size;
+}
+
 // A browser window proxy which is able to associate an aura native window with
 // it.
 class TestBrowserWindowAura : public TestBrowserWindow {
  public:
   TestBrowserWindowAura(Browser* browser, aura::Window *native_window);
   virtual ~TestBrowserWindowAura();
 
   virtual gfx::NativeWindow GetNativeHandle() OVERRIDE {
     return native_window_;
   }
@@ skipping 203 matching lines @@
   gfx::Rect cascade_5 =
       window_positioner()->GetPopupPosition(popup_position_5);
   EXPECT_EQ(gfx::Rect(work_area.x() + grid_size_,
                       work_area.y() + grid_size_,
                       popup_position_5.width(), popup_position_5.height()),
                       cascade_5);
 }
 
 TEST_F(WindowPositionerTest, filling) {
   const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
-
+  int grid = ash::Shell::GetInstance()->GetGridSize();
   gfx::Rect popup_position(0, 0, 256, 128);
   // Leave space on the left and the right and see if we fill top to bottom.
   window()->SetBounds(gfx::Rect(work_area.x() + popup_position.width(),
                                 work_area.y(),
                                 work_area.width() - 2 * popup_position.width(),
                                 work_area.height()));
   window()->Show();
   // Check that we are positioned in the top left corner.
   gfx::Rect top_left = window_positioner()->GetPopupPosition(popup_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       popup_position.width(), popup_position.height()),
                       top_left);
 
   // Now block the found location.
   popup()->SetBounds(top_left);
   popup()->Show();
   gfx::Rect mid_left = window_positioner()->GetPopupPosition(popup_position);
   EXPECT_EQ(gfx::Rect(work_area.x(),
                       work_area.y() + top_left.height(),
                       popup_position.width(), popup_position.height()),
                       mid_left);
 
   // Block now everything so that we can only put the popup on the bottom
   // of the left side.
+  // Note: We need to keep one "grid spacing free" if the window does not
+  // fit into the grid (which is true for 200 height).`
   popup()->SetBounds(gfx::Rect(work_area.x(), work_area.y(),
                                popup_position.width(),
-                               work_area.height() - popup_position.height()));
+                               work_area.height() - popup_position.height() -
+                                   grid + 1));
   gfx::Rect bottom_left = window_positioner()->GetPopupPosition(
                               popup_position);
   EXPECT_EQ(gfx::Rect(work_area.x(),
-                      work_area.y() + work_area.height() -
-                          popup_position.height(),
+                      work_area.bottom() - popup_position.height(),
                       popup_position.width(), popup_position.height()),
                       bottom_left);
 
   // Block now enough to force the right side.
   popup()->SetBounds(gfx::Rect(work_area.x(), work_area.y(),
                                popup_position.width(),
                                work_area.height() - popup_position.height() +
                                1));
   gfx::Rect top_right = window_positioner()->GetPopupPosition(
                             popup_position);
-  EXPECT_EQ(gfx::Rect(work_area.x() + work_area.width() -
-                          popup_position.width(),
+  EXPECT_EQ(gfx::Rect(align(work_area.right() -
+                            popup_position.width(), grid),
                       work_area.y(),
                       popup_position.width(), popup_position.height()),
                       top_right);
 }
 
 TEST_F(WindowPositionerTest, blockedByPanel) {
   const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
 
   gfx::Rect pop_position(0, 0, 200, 200);
   // Let the panel cover everything.
@@ skipping 14 matching lines @@
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash