Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1707)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 10910164: Removes the grid from ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ShelfBrowserTest Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | ash/wm/workspace_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 41888801dfa4c96a8f4493c8d4ab40fe3867d7bd..33f610f09e23fd16fc4350bfa7b936ff9ac84cd8 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -107,11 +107,6 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
}
protected:
- void SetGridSize(int grid_size) {
- Shell::TestApi shell_test(Shell::GetInstance());
- shell_test.workspace_controller()->SetGridSize(grid_size);
- }
-
gfx::Point CalculateDragPoint(const WorkspaceWindowResizer& resizer,
int delta_x,
int delta_y) const {
@@ -161,7 +156,6 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_2) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
@@ -195,7 +189,6 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_Compress) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
@@ -233,7 +226,6 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_3) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
windows.push_back(window3_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
@@ -243,17 +235,17 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_3) {
EXPECT_EQ("400,300 150x200", window2_->bounds().ToString());
EXPECT_EQ("550,300 100x200", window3_->bounds().ToString());
- // Move it 296, which should now snap to grid and things should compress.
- resizer->Drag(CalculateDragPoint(*resizer, 296, -10), 0);
+ // Move it 300, things should compress.
+ resizer->Drag(CalculateDragPoint(*resizer, 300, -10), 0);
EXPECT_EQ("100,300 500x300", window_->bounds().ToString());
EXPECT_EQ("600,300 120x200", window2_->bounds().ToString());
EXPECT_EQ("720,300 80x200", window3_->bounds().ToString());
- // Move it so much everything ends up at its min.
- resizer->Drag(CalculateDragPoint(*resizer, 798, 50), 0);
- EXPECT_EQ("100,300 600x300", window_->bounds().ToString());
- EXPECT_EQ("700,300 60x200", window2_->bounds().ToString());
- EXPECT_EQ("760,300 40x200", window3_->bounds().ToString());
+ // Move it so much the last two end up at their min.
+ resizer->Drag(CalculateDragPoint(*resizer, 800, 50), 0);
+ EXPECT_EQ("100,300 610x300", window_->bounds().ToString());
+ EXPECT_EQ("710,300 52x200", window2_->bounds().ToString());
+ EXPECT_EQ("762,300 38x200", window3_->bounds().ToString());
// Revert and make sure everything moves back.
resizer->RevertDrag();
@@ -274,15 +266,14 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_3_Compress) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
windows.push_back(window3_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
// Move it -100 to the right, which should collapse w1 and expand w2 and w3.
resizer->Drag(CalculateDragPoint(*resizer, -100, -10), 0);
EXPECT_EQ("100,300 100x300", window_->bounds().ToString());
- EXPECT_EQ("200,300 270x200", window2_->bounds().ToString());
- EXPECT_EQ("470,300 130x200", window3_->bounds().ToString());
+ EXPECT_EQ("200,300 266x200", window2_->bounds().ToString());
+ EXPECT_EQ("466,300 134x200", window3_->bounds().ToString());
// Move it 100 to the right.
resizer->Drag(CalculateDragPoint(*resizer, 100, -10), 0);
@@ -293,8 +284,8 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_RIGHT_3_Compress) {
// 100 to the left again.
resizer->Drag(CalculateDragPoint(*resizer, -100, -10), 0);
EXPECT_EQ("100,300 100x300", window_->bounds().ToString());
- EXPECT_EQ("200,300 270x200", window2_->bounds().ToString());
- EXPECT_EQ("470,300 130x200", window3_->bounds().ToString());
+ EXPECT_EQ("200,300 266x200", window2_->bounds().ToString());
+ EXPECT_EQ("466,300 134x200", window3_->bounds().ToString());
}
// Assertions around collapsing and expanding from the bottom.
@@ -304,7 +295,6 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_Compress) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTBOTTOM, windows));
ASSERT_TRUE(resizer.get());
@@ -338,7 +328,6 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_2) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTBOTTOM, windows));
ASSERT_TRUE(resizer.get());
@@ -390,7 +379,6 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_AttachedResize_BOTTOM_3) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
windows.push_back(window3_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTBOTTOM, windows));
ASSERT_TRUE(resizer.get());
@@ -400,17 +388,17 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_AttachedResize_BOTTOM_3) {
EXPECT_EQ("300,400 200x150", window2_->bounds().ToString());
EXPECT_EQ("300,550 200x100", window3_->bounds().ToString());
- // Move it 296, which should now snap to grid and things should compress.
+ // Move it 296 things should compress.
resizer->Drag(CalculateDragPoint(*resizer, -10, 296), 0);
- EXPECT_EQ("300,100 300x500", window_->bounds().ToString());
- EXPECT_EQ("300,600 200x120", window2_->bounds().ToString());
- EXPECT_EQ("300,720 200x80", window3_->bounds().ToString());
+ EXPECT_EQ("300,100 300x496", window_->bounds().ToString());
+ EXPECT_EQ("300,596 200x122", window2_->bounds().ToString());
+ EXPECT_EQ("300,718 200x82", window3_->bounds().ToString());
// Move it so much everything ends up at its min.
resizer->Drag(CalculateDragPoint(*resizer, 50, 798), 0);
- EXPECT_EQ("300,100 300x600", window_->bounds().ToString());
- EXPECT_EQ("300,700 200x60", window2_->bounds().ToString());
- EXPECT_EQ("300,760 200x40", window3_->bounds().ToString());
+ EXPECT_EQ("300,100 300x610", window_->bounds().ToString());
+ EXPECT_EQ("300,710 200x52", window2_->bounds().ToString());
+ EXPECT_EQ("300,762 200x38", window3_->bounds().ToString());
// Revert and make sure everything moves back.
resizer->RevertDrag();
@@ -431,15 +419,14 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3_Compress) {
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
windows.push_back(window3_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTBOTTOM, windows));
ASSERT_TRUE(resizer.get());
// Move it 100 up, which should collapse w1 and expand w2 and w3.
resizer->Drag(CalculateDragPoint(*resizer, -10, -100), 0);
EXPECT_EQ("0,0 200x100", window_->bounds().ToString());
- EXPECT_EQ("10,100 200x270", window2_->bounds().ToString());
- EXPECT_EQ("20,370 100x130", window3_->bounds().ToString());
+ EXPECT_EQ("10,100 200x266", window2_->bounds().ToString());
+ EXPECT_EQ("20,366 100x134", window3_->bounds().ToString());
// Move it 100 down.
resizer->Drag(CalculateDragPoint(*resizer, 10, 100), 0);
@@ -450,8 +437,8 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3_Compress) {
// 100 up again.
resizer->Drag(CalculateDragPoint(*resizer, -10, -100), 0);
EXPECT_EQ("0,0 200x100", window_->bounds().ToString());
- EXPECT_EQ("10,100 200x270", window2_->bounds().ToString());
- EXPECT_EQ("20,370 100x130", window3_->bounds().ToString());
+ EXPECT_EQ("10,100 200x266", window2_->bounds().ToString());
+ EXPECT_EQ("20,366 100x134", window3_->bounds().ToString());
}
// Assertions around dragging to the left/right edge of the screen.
@@ -460,7 +447,6 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(window_.get()).bottom();
window_->SetBounds(gfx::Rect(20, 30, 50, 60));
{
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -474,7 +460,6 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
}
// Try the same with the right side.
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -499,7 +484,6 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiMonitors) {
gfx::Screen::GetPrimaryDisplay());
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
{
- SetGridSize(0);
// Grab (0, 0) of the window.
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
@@ -542,7 +526,7 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiMonitors) {
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(49, 0), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
- resizer->Drag(CalculateDragPoint(*resizer, -49, 610), 0);
+ resizer->Drag(CalculateDragPoint(*resizer, -49, 610), ui::EF_CONTROL_DOWN);
resizer->CompleteDrag(0);
// Since the pointer is on the secondary, the parent should not be changed
// even though only small fraction of the window is within the secondary
@@ -565,13 +549,12 @@ TEST_F(WorkspaceWindowResizerTest,
gfx::Screen::GetDisplayNearestWindow(root_windows[1]));
EXPECT_EQ(root_windows[1], window_->GetRootWindow());
{
- SetGridSize(0);
// Grab (0, 0) of the window.
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
// Move the mouse near the right edge, (798, 0), of the primary display.
- resizer->Drag(CalculateDragPoint(*resizer, 798, -600), 0);
+ resizer->Drag(CalculateDragPoint(*resizer, 798, -600), ui::EF_CONTROL_DOWN);
resizer->CompleteDrag(0);
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
EXPECT_EQ("798,0 50x60", window_->bounds().ToString());
@@ -589,7 +572,6 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_PhantomStyle) {
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
{
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -716,7 +698,6 @@ TEST_F(WorkspaceWindowResizerTest, RestackAttached) {
{
std::vector<aura::Window*> windows;
windows.push_back(window2_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
@@ -730,7 +711,6 @@ TEST_F(WorkspaceWindowResizerTest, RestackAttached) {
{
std::vector<aura::Window*> windows;
windows.push_back(window3_.get());
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window2_.get(), gfx::Point(), HTRIGHT, windows));
ASSERT_TRUE(resizer.get());
@@ -750,7 +730,6 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) {
ASSERT_EQ(1, gfx::Screen::GetNumDisplays());
window_->SetBounds(gfx::Rect(100, 200, 300, 400));
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -767,7 +746,6 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffTop) {
Shell::GetPrimaryRootWindow(), gfx::Insets(10, 0, 0, 0));
window_->SetBounds(gfx::Rect(100, 200, 300, 400));
- SetGridSize(0);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -780,7 +758,6 @@ TEST_F(WorkspaceWindowResizerTest, ResizeBottomOutsideWorkArea) {
Shell::GetPrimaryRootWindow(), gfx::Insets(0, 0, 50, 0));
window_->SetBounds(gfx::Rect(100, 200, 300, 380));
- SetGridSize(10);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTTOP, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -793,7 +770,6 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
Shell::GetInstance()->SetShelfAutoHideBehavior(
SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -802,8 +778,8 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
// An x-coordinate of 7 should snap.
resizer->Drag(CalculateDragPoint(*resizer, -89, 0), 0);
EXPECT_EQ("0,112 320x160", window_->bounds().ToString());
- // Move to -20, should still snap to 0.
- resizer->Drag(CalculateDragPoint(*resizer, -116, 0), 0);
+ // Move to -15, should still snap to 0.
+ resizer->Drag(CalculateDragPoint(*resizer, -111, 0), 0);
EXPECT_EQ("0,112 320x160", window_->bounds().ToString());
// At -32 should move past snap points.
resizer->Drag(CalculateDragPoint(*resizer, -128, 0), 0);
@@ -816,7 +792,7 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
EXPECT_EQ("465,112 320x160", window_->bounds().ToString());
resizer->Drag(CalculateDragPoint(*resizer, 800 - 320 - 96 - 7, 0), 0);
EXPECT_EQ("480,112 320x160", window_->bounds().ToString());
- resizer->Drag(CalculateDragPoint(*resizer, 800 - 320 - 96 + 20, 0), 0);
+ resizer->Drag(CalculateDragPoint(*resizer, 800 - 320 - 96 + 15, 0), 0);
EXPECT_EQ("480,112 320x160", window_->bounds().ToString());
resizer->Drag(CalculateDragPoint(*resizer, 800 - 320 - 96 + 32, 0), 0);
EXPECT_EQ("512,112 320x160", window_->bounds().ToString());
@@ -824,14 +800,14 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
EXPECT_EQ("513,112 320x160", window_->bounds().ToString());
// And the bottom should snap too.
- resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 - 15), 0);
- EXPECT_EQ("96,432 320x160", window_->bounds().ToString());
- resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 + 20), 0);
- EXPECT_EQ("96,432 320x160", window_->bounds().ToString());
- resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 + 32), 0);
- EXPECT_EQ("96,472 320x160", window_->bounds().ToString());
- resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 + 33), 0);
- EXPECT_EQ("96,473 320x160", window_->bounds().ToString());
+ resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 - 2 - 7), 0);
+ EXPECT_EQ("96,438 320x160", window_->bounds().ToString());
+ resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 - 2 + 15), 0);
+ EXPECT_EQ("96,438 320x160", window_->bounds().ToString());
+ resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 - 2 + 32), 0);
+ EXPECT_EQ("96,470 320x160", window_->bounds().ToString());
+ resizer->Drag(CalculateDragPoint(*resizer, 0, 600 - 160 - 112 - 2 + 33), 0);
+ EXPECT_EQ("96,471 320x160", window_->bounds().ToString());
// And the top should snap too.
resizer->Drag(CalculateDragPoint(*resizer, 0, -112 + 20), 0);
@@ -848,28 +824,14 @@ TEST_F(WorkspaceWindowResizerTest, TallWindow) {
Shell::GetInstance()->SetDisplayWorkAreaInsets(
root, gfx::Insets(0, 0, 50, 0));
window_->SetBounds(gfx::Rect(0, 0, 320, 560));
- SetGridSize(16);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
resizer->Drag(CalculateDragPoint(*resizer, 0, 9), 0);
EXPECT_EQ("0,9 320x560", window_->bounds().ToString());
}
-TEST_F(WorkspaceWindowResizerTest, DragResizeSnapToGrid) {
- window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
- scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(), gfx::Point(), HTBOTTOMRIGHT, empty_windows()));
- ASSERT_TRUE(resizer.get());
- // Resize the right bottom to add 10 in width, 12 in height.
- resizer->Drag(CalculateDragPoint(*resizer, 10, 12), 0);
- // Both bottom and right sides should snap to grids.
- EXPECT_EQ("96,112 336x176", window_->bounds().ToString());
-}
-
TEST_F(WorkspaceWindowResizerTest, CtrlDragResizeToExactPosition) {
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTBOTTOMRIGHT, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -879,22 +841,8 @@ TEST_F(WorkspaceWindowResizerTest, CtrlDragResizeToExactPosition) {
EXPECT_EQ("96,112 330x172", window_->bounds().ToString());
}
-TEST_F(WorkspaceWindowResizerTest, CompleteDragMoveSnapToGrid) {
- window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
- scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
- ASSERT_TRUE(resizer.get());
- // Drag the window to new poistion by adding (10, 12) to original point,
- // the window should snap to the closed grid.
- resizer->Drag(CalculateDragPoint(*resizer, 10, 12), 0);
- resizer->CompleteDrag(0);
- EXPECT_EQ("112,128 320x160", window_->bounds().ToString());
-}
-
TEST_F(WorkspaceWindowResizerTest, CtrlCompleteDragMoveToExactPosition) {
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
ASSERT_TRUE(resizer.get());
@@ -908,9 +856,8 @@ TEST_F(WorkspaceWindowResizerTest, CtrlCompleteDragMoveToExactPosition) {
// Check that only usable sizes get returned by the resizer.
TEST_F(WorkspaceWindowResizerTest, TestProperSizerResolutions) {
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- SetGridSize(16);
scoped_ptr<SnapSizer> resizer(new SnapSizer(
- window_.get(), gfx::Point(), SnapSizer::LEFT_EDGE, 1));
+ window_.get(), gfx::Point(), SnapSizer::LEFT_EDGE));
ASSERT_TRUE(resizer.get());
gfx::Rect rect = resizer->GetTargetBoundsForSize(0);
EXPECT_EQ("0,0 720x552", rect.ToString());
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | ash/wm/workspace_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698