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/root_window_controller_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/root_window_controller_unittest.cc')
| -rw-r--r-- | ash/root_window_controller_unittest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 67842f0..76d652d 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -92,8 +92,6 @@ typedef test::AshTestBase RootWindowControllerTest; TEST_F(RootWindowControllerTest, MoveWindows_Basic) { UpdateDisplay("600x600,500x500"); Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); - ash::Shell::GetInstance()->SetShelfAutoHideBehavior( - ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100)); EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow()); @@ -149,7 +147,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) { EXPECT_EQ("50,10 100x100", normal->GetNativeView()->GetBoundsInRootWindow().ToString()); - // Maximized area on primary display has 3px (given as + // Maximized area on primary display has 2px (given as // kAutoHideSize in shelf_layout_manager.cc) inset at the bottom. EXPECT_EQ(root_windows[0], maximized->GetNativeView()->GetRootWindow()); EXPECT_EQ("0,0 600x597", |