diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 23:02:49 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 23:02:49 +0000 |
| commit | 2c6ccdf53bcecd75637d345a246f48d499a576fb (patch) | |
| tree | 3899626c0db0a49a178055302603d867f297b8ff /ash/screen_ash_unittest.cc | |
| parent | 6982f488324851658dd1292f78ea7d0f8161482f (diff) | |
| download | chromium_src-2c6ccdf53bcecd75637d345a246f48d499a576fb.zip chromium_src-2c6ccdf53bcecd75637d345a246f48d499a576fb.tar.gz chromium_src-2c6ccdf53bcecd75637d345a246f48d499a576fb.tar.bz2 | |
Revert of AutoHide Behavior
BUG=146773
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10969076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158436 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, 2 insertions, 4 deletions
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc index 7714159..3d94910 100644 --- a/ash/screen_ash_unittest.cc +++ b/ash/screen_ash_unittest.cc @@ -22,8 +22,6 @@ 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)); @@ -41,7 +39,7 @@ TEST_F(ScreenAshTest, Bounds) { secondary->GetNativeView()).ToString()); // Unmaximized work area bounds - EXPECT_EQ("0,0 600x597", + EXPECT_EQ("0,0 600x552", ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent( primary->GetNativeView()).ToString()); EXPECT_EQ("0,0 500x500", @@ -57,7 +55,7 @@ TEST_F(ScreenAshTest, Bounds) { secondary->GetNativeView()).ToString()); // Work area bounds - EXPECT_EQ("0,0 600x597", + EXPECT_EQ("0,0 600x552", ScreenAsh::GetDisplayWorkAreaBoundsInParent( primary->GetNativeView()).ToString()); EXPECT_EQ("0,0 500x500", |