diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 20:26:24 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 20:26:24 +0000 |
| commit | eefd51b286e6916937cbe46161c52c8c4a1e0b68 (patch) | |
| tree | 6c0b6d2c66fbc4844b545fdba74e471204d0138e /ash/screen_ash_unittest.cc | |
| parent | 8c4474b9eaca88cc2dd3aced013587d95e1d4b58 (diff) | |
| download | chromium_src-eefd51b286e6916937cbe46161c52c8c4a1e0b68.zip chromium_src-eefd51b286e6916937cbe46161c52c8c4a1e0b68.tar.gz chromium_src-eefd51b286e6916937cbe46161c52c8c4a1e0b68.tar.bz2 | |
Autohide behavior simplified to always/never
BUG=146773
Review URL: https://chromiumcodereview.appspot.com/10987005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158639 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", |