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

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

Issue 9764008: Makes the launcher auto-hide for maximized windows. This turned out to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add null checks and cleanup Created 8 years, 9 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
« ash/launcher/launcher.cc ('K') | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | no next file » | 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 dc74a501e1b616aebd8ce86f147e0f56dcf66624..a7986adcaf1146800cff9683a0cc5db16ed9c2cf 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -406,6 +406,8 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3_Compress) {
// Assertions around dragging to the left/right edge of the screen.
TEST_F(WorkspaceWindowResizerTest, Edge) {
+ int bottom =
+ ScreenAsh::GetUnmaximizedWorkAreaBounds(window_.get()).bottom();
window_->SetBounds(gfx::Rect(20, 30, 50, 60));
{
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
@@ -413,7 +415,8 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 10));
resizer->CompleteDrag();
- EXPECT_EQ("0,0 400x600", window_->bounds().ToString());
+ EXPECT_EQ("0,0 400x" + base::IntToString(bottom),
+ window_->bounds().ToString());
ASSERT_TRUE(GetRestoreBounds(window_.get()));
EXPECT_EQ("20,30 50x60", GetRestoreBounds(window_.get())->ToString());
}
@@ -424,7 +427,8 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 800, 10));
resizer->CompleteDrag();
- EXPECT_EQ("400,0 400x600", window_->bounds().ToString());
+ EXPECT_EQ("400,0 400x" + base::IntToString(bottom),
+ window_->bounds().ToString());
ASSERT_TRUE(GetRestoreBounds(window_.get()));
EXPECT_EQ("20,30 50x60", GetRestoreBounds(window_.get())->ToString());
}
« ash/launcher/launcher.cc ('K') | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698