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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missed rm #include Created 7 years, 4 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
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index b4c16e35f2ad1ffa49014c8bff1208a0a3099133..86feabe981c79481dfa6d672d8917ef54208bb1b 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -171,8 +171,8 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100));
maximized->Maximize();
EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow());
- EXPECT_EQ("600,0 500x452", maximized->GetWindowBoundsInScreen().ToString());
- EXPECT_EQ("0,0 500x452",
+ EXPECT_EQ("600,0 500x453", maximized->GetWindowBoundsInScreen().ToString());
Mr4D (OOO till 08-26) 2013/08/27 02:35:14 Odd. Is the +1 because of the new shelf layout?
Harry McCleave 2013/08/27 03:25:45 Yes, shelf is 1 px smaller (oh yes, soo much fun f
Mr4D (OOO till 08-26) 2013/08/27 14:13:36 Since this was such a small change with such a hug
+ EXPECT_EQ("0,0 500x453",
maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100));

Powered by Google App Engine
This is Rietveld 408576698