Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: ash/launcher/launcher_context_menu_unittest.cc

Issue 10273012: ash: Fix shelf auto hide behavior not persisted regression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/launcher/launcher_context_menu_unittest.cc
diff --git a/ash/launcher/launcher_context_menu_unittest.cc b/ash/launcher/launcher_context_menu_unittest.cc
index 5143d694d7c3a4e66917daebf09b72229fda0e9f..225351e30788fc4e365505d5dbdadae1a13e2c97 100644
--- a/ash/launcher/launcher_context_menu_unittest.cc
+++ b/ash/launcher/launcher_context_menu_unittest.cc
@@ -33,19 +33,23 @@ TEST_F(LauncherContextMenuTest, ToggleAutoHide) {
EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
shell->GetShelfAutoHideBehavior());
EXPECT_FALSE(LauncherContextMenu::IsAutoHideMenuHideChecked());
- LauncherContextMenu::ToggleAutoHideMenu();
+ shell->SetShelfAutoHideBehavior(
+ LauncherContextMenu::GetToggledAutoHideBehavior());
EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
shell->GetShelfAutoHideBehavior());
- LauncherContextMenu::ToggleAutoHideMenu();
+ shell->SetShelfAutoHideBehavior(
+ LauncherContextMenu::GetToggledAutoHideBehavior());
EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
shell->GetShelfAutoHideBehavior());
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
EXPECT_TRUE(LauncherContextMenu::IsAutoHideMenuHideChecked());
- LauncherContextMenu::ToggleAutoHideMenu();
+ shell->SetShelfAutoHideBehavior(
+ LauncherContextMenu::GetToggledAutoHideBehavior());
EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
shell->GetShelfAutoHideBehavior());
- LauncherContextMenu::ToggleAutoHideMenu();
+ shell->SetShelfAutoHideBehavior(
+ LauncherContextMenu::GetToggledAutoHideBehavior());
EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
shell->GetShelfAutoHideBehavior());
}
« no previous file with comments | « ash/launcher/launcher_context_menu.cc ('k') | chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698