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/root_window_controller_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/root_window_controller_unittest.cc')
| -rw-r--r-- | ash/root_window_controller_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 76d652d..67842f0 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -92,6 +92,8 @@ 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()); @@ -147,7 +149,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) { EXPECT_EQ("50,10 100x100", normal->GetNativeView()->GetBoundsInRootWindow().ToString()); - // Maximized area on primary display has 2px (given as + // Maximized area on primary display has 3px (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", |