diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:12:50 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:12:50 +0000 |
| commit | fba1eb214a613eefad7dde40eefbb50a12320a45 (patch) | |
| tree | fde1d915c2ac20555f08e849e784c22c9f6add20 /ash/focus_cycler_unittest.cc | |
| parent | 835c1511386275bdcefb7ef140761f92aea972fb (diff) | |
| download | chromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.zip chromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.tar.gz chromium_src-fba1eb214a613eefad7dde40eefbb50a12320a45.tar.bz2 | |
Remove --ash-disable-overview-mode
BUG=340466
Review URL: https://codereview.chromium.org/181563004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 66be1ed..5b25d96 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) { |