Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2756)

Unified Diff: ash/wm/window_manager_unittest.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ash/wm/window_modality_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index ac72def7056e79642da9928a4a22c1cc2352b4fd..d6672fe8a11fb81008b91fdd4f27c0045f489b13 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(
« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ash/wm/window_modality_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698