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 4cf3d74515f43abf6f2b94ce43708caf8c44c38b..52419e74806e49084d945bf3c8c7c289be96e7fe 100644 |
--- a/ash/shelf/shelf_layout_manager_unittest.cc |
+++ b/ash/shelf/shelf_layout_manager_unittest.cc |
@@ -1132,7 +1132,7 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfVisibleState) { |
layout_manager->LayoutShelf(); |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); |
- // Create a normal unmaximized windowm shelf should be visible. |
+ // Create a normal unmaximized window, shelf should be visible. |
aura::Window* window = CreateTestWindow(); |
window->SetBounds(gfx::Rect(0, 0, 100, 100)); |
window->Show(); |
@@ -1160,15 +1160,9 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) { |
layout_manager->LayoutShelf(); |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
- // Create a window and show it in maximized state. |
- aura::Window* window = CreateTestWindow(); |
- window->SetBounds(gfx::Rect(0, 0, 100, 100)); |
- window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); |
- window->Show(); |
- wm::ActivateWindow(window); |
- |
EXPECT_FALSE(shell->GetAppListTargetVisibility()); |
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); |
James Cook
2016/11/30 23:27:19
Thanks for checking this case.
|
// Show app list. |
shell->ShowAppList(); |
@@ -1183,6 +1177,7 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) { |
shell->DismissAppList(); |
EXPECT_FALSE(shell->GetAppListTargetVisibility()); |
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); |
} |
// Makes sure that when we have dual displays, with one or both shelves are set |