diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 12:17:54 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 12:17:54 +0000 |
| commit | f3c7b255f0236e34a8d0517bc5993180f4f35241 (patch) | |
| tree | 61943d334ac61fd03bbef2bb2413840ad873603b | |
| parent | 0477e8e68f2e3e28ca6c19a6edfb3e746b6df82d (diff) | |
| download | chromium_src-f3c7b255f0236e34a8d0517bc5993180f4f35241.zip chromium_src-f3c7b255f0236e34a8d0517bc5993180f4f35241.tar.gz chromium_src-f3c7b255f0236e34a8d0517bc5993180f4f35241.tar.bz2 | |
ash: Fix chromeos build by adding missing wm:: for focus_cycler_unittest.cc
This file was added after I sent my previous patch to trybots hence why it broke.
BUG=115846
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9447101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123731 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 2642182..f878503 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -32,12 +32,12 @@ TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) { ash::Shell::GetInstance()->GetContainer( internal::kShellWindowId_DefaultContainer); scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); - ActivateWindow(window0.get()); - EXPECT_TRUE(IsActiveWindow(window0.get())); + wm::ActivateWindow(window0.get()); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); // Cycle the window focus_cycler->RotateFocus(FocusCycler::FORWARD); - EXPECT_TRUE(IsActiveWindow(window0.get())); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); } TEST_F(FocusCyclerTest, CycleFocusForward) { @@ -65,8 +65,8 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { ash::Shell::GetInstance()->GetContainer( internal::kShellWindowId_DefaultContainer); scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); - ActivateWindow(window0.get()); - EXPECT_TRUE(IsActiveWindow(window0.get())); + wm::ActivateWindow(window0.get()); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); // Cycle focus to the status area focus_cycler->RotateFocus(FocusCycler::FORWARD); @@ -78,7 +78,7 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { // Cycle focus to the browser focus_cycler->RotateFocus(FocusCycler::FORWARD); - EXPECT_TRUE(IsActiveWindow(window0.get())); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); } TEST_F(FocusCyclerTest, CycleFocusBackward) { @@ -106,8 +106,8 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { ash::Shell::GetInstance()->GetContainer( internal::kShellWindowId_DefaultContainer); scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); - ActivateWindow(window0.get()); - EXPECT_TRUE(IsActiveWindow(window0.get())); + wm::ActivateWindow(window0.get()); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); // Cycle focus to the launcher focus_cycler->RotateFocus(FocusCycler::BACKWARD); @@ -119,7 +119,7 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { // Cycle focus to the browser focus_cycler->RotateFocus(FocusCycler::BACKWARD); - EXPECT_TRUE(IsActiveWindow(window0.get())); + EXPECT_TRUE(wm::IsActiveWindow(window0.get())); } } // namespace test |