Ignoring alignment when it pushes a window out of the screen

chrome/browser/ui/window_sizer_ash_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/window_sizer.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
+#include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/window_sizer_common_unittest.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/test/render_view_test.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 53 matching lines @@
                                              aura::Window *native_window) :
     TestBrowserWindow(browser),
     native_window_(native_window) {
 }
 
 TestBrowserWindowAura::~TestBrowserWindowAura() {}
 
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerTest, DefaultSizeCase) {
-  EXPECT_EQ(WindowSizer::kDesktopBorderSize,
-            ash::Shell::GetInstance()->GetGridSize());
+  int grid = ash::Shell::GetInstance()->GetGridSize();
+  EXPECT_EQ(WindowSizer::kDesktopBorderSize, grid);
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
                         768 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on bottom
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_bottom_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        (taskbar_bottom_work_area.height() -
-                            WindowSizer::kDesktopBorderSize)),
-              window_bounds);
+                        ash::WindowResizer::AlignToGridRoundDown(
+                            taskbar_bottom_work_area.height() -
+                            WindowSizer::kDesktopBorderSize, grid)),
+                        window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on right
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_right_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        taskbar_right_work_area.width() -
-                          WindowSizer::kDesktopBorderSize*2,
+                        ash::WindowResizer::AlignToGridRoundDown(
+                            taskbar_right_work_area.width() -
+                            WindowSizer::kDesktopBorderSize * 2, grid),
                         768 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on left
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x() +
                           WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        taskbar_left_work_area.width() -
-                          WindowSizer::kDesktopBorderSize * 2,
-                        taskbar_left_work_area.height() -
-                          WindowSizer::kDesktopBorderSize),
+                        ash::WindowResizer::AlignToGridRoundDown(
+                            taskbar_left_work_area.width() -
+                        WindowSizer::kDesktopBorderSize * 2, grid),
+                            ash::WindowResizer::AlignToGridRoundDown(
+                            taskbar_left_work_area.height() -
+                            WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on top
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         taskbar_top_work_area.y() +
                           WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        taskbar_top_work_area.height() -
-                          WindowSizer::kDesktopBorderSize),
+                        ash::WindowResizer::AlignToGridRoundDown(
+                            taskbar_top_work_area.height() -
+                            WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1280x1024
     gfx::Rect window_bounds;
     GetWindowBounds(twelveeighty, twelveeighty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1280 - 2 * WindowSizer::kDesktopBorderSize,
@@ skipping 10 matching lines @@
                         1200 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
 
   { // 16:10 monitor case, 1680x1050
     gfx::Rect window_bounds;
     GetWindowBounds(sixteeneighty, sixteeneighty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect((1680 - 1280) / 2, WindowSizer::kDesktopBorderSize,
                         1280,
-                        1050 - WindowSizer::kDesktopBorderSize),
+                        ash::WindowResizer::AlignToGridRoundDown(
+                            1050 - WindowSizer::kDesktopBorderSize,
+                            grid)),
               window_bounds);
   }
 
   { // 16:10 monitor case, 1920x1200
     gfx::Rect window_bounds;
     GetWindowBounds(nineteentwenty, nineteentwenty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect((1920 - 1280) / 2, WindowSizer::kDesktopBorderSize,
                         1280,
                         1200 - WindowSizer::kDesktopBorderSize),
@@ skipping 471 matching lines @@
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
                     PERSISTED, &window_bounds, browser.get());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - 2 * WindowSizer::kDesktopBorderSize,
                         768 - WindowSizer::kDesktopBorderSize),
                         window_bounds);
   }
 }