diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
| commit | 521c703f8d62fa698c3e88287c64d8d23f9ac675 (patch) | |
| tree | 2e50833697a511a3cbc1f589fc4e17d466b82f03 /ash/wm/window_manager_unittest.cc | |
| parent | 46e49bdb2dcac1f906d01c8373e9fc3c8ce2186c (diff) | |
| download | chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.zip chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.gz chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.bz2 | |
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_manager_unittest.cc')
| -rw-r--r-- | ash/wm/window_manager_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index ac72def..d6672fe 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -665,7 +665,7 @@ TEST_F(WindowManagerTest, AdditionalFilters) { scoped_ptr<CustomEventHandler> f2(new CustomEventHandler); // Adds them to root window event filter. - views::corewm::CompoundEventFilter* env_filter = + ::wm::CompoundEventFilter* env_filter = Shell::GetInstance()->env_filter(); env_filter->AddHandler(f1.get()); env_filter->AddHandler(f2.get()); @@ -733,7 +733,7 @@ TEST_F(WindowManagerTest, AdditionalFilters) { // our internal tracking of the cursor state on ChromeOS (crbug.com/333952). TEST_F(WindowManagerTest, UpdateCursorVisibility) { aura::test::EventGenerator& generator = GetEventGenerator(); - views::corewm::CursorManager* cursor_manager = + ::wm::CursorManager* cursor_manager = ash::Shell::GetInstance()->cursor_manager(); generator.MoveMouseTo(gfx::Point(0, 0)); @@ -754,7 +754,7 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) { // (crbug.com/304296). TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) { aura::test::EventGenerator& generator = GetEventGenerator(); - views::corewm::CursorManager* cursor_manager = + ::wm::CursorManager* cursor_manager = ash::Shell::GetInstance()->cursor_manager(); // Pressing a key hides the cursor but does not disable mouse events. @@ -777,7 +777,7 @@ TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) { TEST_F(WindowManagerTest, TestCursorClientObserver) { aura::test::EventGenerator& generator = GetEventGenerator(); - views::corewm::CursorManager* cursor_manager = + ::wm::CursorManager* cursor_manager = ash::Shell::GetInstance()->cursor_manager(); scoped_ptr<aura::Window> w1(CreateTestWindowInShell( |