Index: ash/focus_cycler_unittest.cc |
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc |
index 66be1ed258c7e23120122d418ee2f7553a2e75b6..5b25d966b3c654e5b98679899092bd0b5bb413b3 100644 |
--- a/ash/focus_cycler_unittest.cc |
+++ b/ash/focus_cycler_unittest.cc |
@@ -252,13 +252,16 @@ TEST_F(FocusCyclerTest, CycleFocusNoBrowser) { |
EXPECT_TRUE(tray()->GetWidget()->IsActive()); |
} |
+// Tests that focus cycles from the active browser to the status area and back. |
TEST_F(FocusCyclerTest, Shelf_CycleFocusForward) { |
ASSERT_TRUE(CreateTray()); |
InstallFocusCycleOnShelf(); |
shelf_widget()->Hide(); |
- // Create a single test window. |
+ // Create two test windows. |
scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0)); |
+ scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1)); |
+ wm::ActivateWindow(window1.get()); |
wm::ActivateWindow(window0.get()); |
EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
@@ -269,6 +272,10 @@ TEST_F(FocusCyclerTest, Shelf_CycleFocusForward) { |
// Cycle focus to the browser. |
focus_cycler()->RotateFocus(FocusCycler::FORWARD); |
EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |
+ |
+ // Cycle focus to the status area. |
+ focus_cycler()->RotateFocus(FocusCycler::FORWARD); |
+ EXPECT_TRUE(tray()->GetWidget()->IsActive()); |
} |
TEST_F(FocusCyclerTest, Shelf_CycleFocusBackwardInvisible) { |