ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/root_window_controller_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 "ash/root_window_controller.h"
 
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 153 matching lines @@
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
   EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
   EXPECT_EQ("650,10 100x100", normal->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("50,10 100x100",
             normal->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   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 for so small a change).

[Mr4D (OOO till 08-26), 2013/08/27 14:13:36]

Since this was such a small change with such a huge fallout + our designers like
to change things around by one pixel I would have possibly created a global
factor and name it like "kHorizontalShelfSize" and calculated the size in these
commands. That way a change to a new size would have been much less work. So
maybe not this time, but next time. :)

+  EXPECT_EQ("0,0 500x453",
             maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100));
   minimized->Minimize();
   EXPECT_EQ(root_windows[1], minimized->GetNativeView()->GetRootWindow());
   EXPECT_EQ("800,10 100x100",
             minimized->GetWindowBoundsInScreen().ToString());
 
   views::Widget* fullscreen = CreateTestWidget(gfx::Rect(900, 10, 100, 100));
   fullscreen->SetFullscreen(true);
@@ skipping 380 matching lines @@
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
     event_generator.ClickLeftButton();
     expected_mouse_presses++;
     EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
     UnblockUserSession();
   }
 }
 
 }  // namespace test
 }  // namespace ash