ash/shelf/shelf_layout_manager_unittest.cc - Issue 460933002: Split Shell::ToggleAppList() into ShowAppList and DismissAppList.

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 460933002: Split Shell::ToggleAppList() into ShowAppList and DismissAppList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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/shelf/shelf_layout_manager_unittest.cc

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc

index d0339600c6a3a043bb9f21f8a323a8968aad8038..d3ccc97bd550ae393534f4d5f739aede0098de4b 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -1279,12 +1279,12 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfVisibleState) {

EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());

// Toggle app list to show, and the shelf stays visible.

Matt Giuca 2014/08/14 04:17:07 // Show app list, ...

calamity 2014/08/14 05:00:59 Done.

- shell->ToggleAppList(NULL);

+ shell->ShowAppList(NULL);

EXPECT_TRUE(shell->GetAppListTargetVisibility());

EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());

// Toggle app list to hide, and the shelf stays visible.

Matt Giuca 2014/08/14 04:17:07 // Hide app list, ... (and continue throughout th

calamity 2014/08/14 05:00:59 Done.

- shell->ToggleAppList(NULL);

+ shell->DismissAppList();

EXPECT_FALSE(shell->GetAppListTargetVisibility());

EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());

}

@@ -1309,7 +1309,7 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) {

EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());

// Toggle app list to show.

- shell->ToggleAppList(NULL);

+ shell->ShowAppList(NULL);

// The shelf's auto hide state won't be changed until the timer fires, so

// calling shell->UpdateShelfVisibility() is kind of manually helping it to

// update the state.

@@ -1319,7 +1319,7 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) {

EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());

// Toggle app list to hide.

- shell->ToggleAppList(NULL);

+ shell->DismissAppList();

EXPECT_FALSE(shell->GetAppListTargetVisibility());

EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());

}

@@ -1344,12 +1344,12 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfHiddenState) {

EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());

// Toggle app list to show.

- shell->ToggleAppList(NULL);

+ shell->ShowAppList(NULL);

EXPECT_TRUE(shell->GetAppListTargetVisibility());

EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());

// Toggle app list to hide.

- shell->ToggleAppList(NULL);

+ shell->DismissAppList();

EXPECT_FALSE(shell->GetAppListTargetVisibility());

EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());

}

« ash/shelf/app_list_shelf_item_delegate.cc ('K') | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | ash/shell.cc » ('J')