diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:29:08 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:29:08 +0000 |
| commit | d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9 (patch) | |
| tree | 412dc2212f7d519bb6ea31b6f818c4c1cc1490c3 /ash/screen_ash_unittest.cc | |
| parent | 3b1187b9988e8441c620c862f92ff49d5227f6e4 (diff) | |
| download | chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.zip chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.tar.gz chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.tar.bz2 | |
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
Diffstat (limited to 'ash/screen_ash_unittest.cc')
| -rw-r--r-- | ash/screen_ash_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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", |