From d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9 Mon Sep 17 00:00:00 2001 From: "harrym@chromium.org" Date: Fri, 21 Sep 2012 21:29:08 +0000 Subject: Simplified Launcher Auto-Hide behavior, now has two behavior modes (always hide, never hide) defaulting to have the launcher always visible. BUG=146773 Review URL: https://chromiumcodereview.appspot.com/10961006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158083 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/screen_ash_unittest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ash/screen_ash_unittest.cc') diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc index 3d94910..7714159 100644 --- a/ash/screen_ash_unittest.cc +++ b/ash/screen_ash_unittest.cc @@ -22,6 +22,8 @@ typedef test::AshTestBase ScreenAshTest; #if !defined(OS_WIN) TEST_F(ScreenAshTest, Bounds) { UpdateDisplay("600x600,500x500"); + Shell::GetInstance()->SetShelfAutoHideBehavior( + ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); views::Widget* primary = views::Widget::CreateWindowWithBounds(NULL, gfx::Rect(10, 10, 100, 100)); @@ -39,7 +41,7 @@ TEST_F(ScreenAshTest, Bounds) { secondary->GetNativeView()).ToString()); // Unmaximized work area bounds - EXPECT_EQ("0,0 600x552", + EXPECT_EQ("0,0 600x597", ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent( primary->GetNativeView()).ToString()); EXPECT_EQ("0,0 500x500", @@ -55,7 +57,7 @@ TEST_F(ScreenAshTest, Bounds) { secondary->GetNativeView()).ToString()); // Work area bounds - EXPECT_EQ("0,0 600x552", + EXPECT_EQ("0,0 600x597", ScreenAsh::GetDisplayWorkAreaBoundsInParent( primary->GetNativeView()).ToString()); EXPECT_EQ("0,0 500x500", -- cgit v1.1