Index: ash/wm/app_list_controller_unittest.cc |
diff --git a/ash/wm/app_list_controller_unittest.cc b/ash/wm/app_list_controller_unittest.cc |
index 05ceae3ba61465744035fb2edea30e9ba9a6db37..7691567f96bf331f33d9092f699fcbfabf6f0afb 100644 |
--- a/ash/wm/app_list_controller_unittest.cc |
+++ b/ash/wm/app_list_controller_unittest.cc |
@@ -55,7 +55,7 @@ bool AppListControllerTest::IsCentered() const { |
// Tests that app launcher hides when focus moves to a normal window. |
TEST_P(AppListControllerTest, HideOnFocusOut) { |
- Shell::GetInstance()->ToggleAppList(NULL); |
+ Shell::GetInstance()->ShowAppList(NULL); |
EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0)); |
@@ -67,7 +67,7 @@ TEST_P(AppListControllerTest, HideOnFocusOut) { |
// Tests that app launcher remains visible when focus is moved to a different |
// window in kShellWindowId_AppListContainer. |
TEST_P(AppListControllerTest, RemainVisibleWhenFocusingToApplistContainer) { |
- Shell::GetInstance()->ToggleAppList(NULL); |
+ Shell::GetInstance()->ShowAppList(NULL); |
EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
aura::Window* applist_container = Shell::GetContainer( |
@@ -82,7 +82,7 @@ TEST_P(AppListControllerTest, RemainVisibleWhenFocusingToApplistContainer) { |
// Tests that clicking outside the app-list bubble closes it. |
TEST_P(AppListControllerTest, ClickOutsideBubbleClosesBubble) { |
Shell* shell = Shell::GetInstance(); |
- shell->ToggleAppList(NULL); |
+ shell->ShowAppList(NULL); |
aura::Window* app_window = shell->GetAppListWindow(); |
ASSERT_TRUE(app_window); |
@@ -105,7 +105,7 @@ TEST_P(AppListControllerTest, ClickOutsideBubbleClosesBubble) { |
// Tests that clicking outside the app-list bubble closes it. |
TEST_P(AppListControllerTest, TapOutsideBubbleClosesBubble) { |
Shell* shell = Shell::GetInstance(); |
- shell->ToggleAppList(NULL); |
+ shell->ShowAppList(NULL); |
aura::Window* app_window = shell->GetAppListWindow(); |
ASSERT_TRUE(app_window); |
@@ -139,7 +139,7 @@ TEST_P(AppListControllerTest, NonPrimaryDisplay) { |
aura::Window* secondary_window = root_windows[1]; |
EXPECT_EQ("800,0 800x600", secondary_window->GetBoundsInScreen().ToString()); |
- Shell::GetInstance()->ToggleAppList(secondary_window); |
+ Shell::GetInstance()->ShowAppList(secondary_window); |
EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
// Remove the secondary display. Shouldn't crash (http://crbug.com/368990). |
@@ -166,7 +166,7 @@ TEST_P(AppListControllerTest, TinyDisplay) { |
// Set up a screen with a tiny display (height smaller than the app list). |
UpdateDisplay("400x300"); |
- Shell::GetInstance()->ToggleAppList(NULL); |
+ Shell::GetInstance()->ShowAppList(NULL); |
EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
// The top of the app list should be on-screen (even if the bottom is not). |