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"
@@ skipping 12 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 
 
 namespace {
 
 typedef ash::test::AshTestBase WindowSizerTest;
 
+// A function which aligns a size to a step within the grid.
+int align(int size, int alignment_factor) {

[sky, 2012/04/13 23:37:29]

Replace this (and the copy in your other test) with AlignToGridRoundDown.

[Mr4D (OOO till 08-26), 2012/04/14 00:19:45]

Same here - This isn't my code anymore.

+  if (alignment_factor > 1) {
+    return size - size % alignment_factor;
+  }
+  return size;
+}
+
 // A special test class for use with browser creation - it will create a
 // browser thread and deletes it after all other things have been destroyed.
 class WindowSizerTestWithBrowser : public WindowSizerTest {
  public:
   WindowSizerTestWithBrowser();
   ~WindowSizerTestWithBrowser();
 
  private:
   // Note: It is important to delete the thread after the browser instances got
   // deleted. For this we transfer the thread here.
@@ skipping 33 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);
+                        align(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,
+                        align(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),
+                        align(taskbar_left_work_area.width() -
+                              WindowSizer::kDesktopBorderSize * 2, grid),
+                        align(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),
+                        align(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),
+                        align(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);
   }
 }