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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/unified_mouse_warp_controller_unittest.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: Created 4 years, 2 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
« ash/display/mouse_cursor_event_filter.cc ('K') | « ash/display/unified_mouse_warp_controller.cc ('k') | ash/display/window_tree_host_manager.h » ('j') | ash/root_window_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/unified_mouse_warp_controller_unittest.cc
diff --git a/ash/display/unified_mouse_warp_controller_unittest.cc b/ash/display/unified_mouse_warp_controller_unittest.cc
index 74842b1801c5e06e8131766c440bb4d665d72aef..8eb0f1597425fd429d630b63551d2b0da9ca3413 100644
--- a/ash/display/unified_mouse_warp_controller_unittest.cc
+++ b/ash/display/unified_mouse_warp_controller_unittest.cc
@@ -4,19 +4,19 @@
#include "ash/display/unified_mouse_warp_controller.h"
-#include "ash/display/display_manager.h"
#include "ash/display/display_util.h"
#include "ash/display/mirror_window_controller.h"
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/host/ash_window_tree_host.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
#include "ui/aura/env.h"
#include "ui/aura/window_tree_host.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
oshima 2016/10/24 19:29:16 ditto
rjkroege 2016/10/25 23:30:26 Done.
#include "ui/events/test/event_generator.h"
#include "ui/wm/core/coordinate_conversion.h"
« ash/display/mouse_cursor_event_filter.cc ('K') | « ash/display/unified_mouse_warp_controller.cc ('k') | ash/display/window_tree_host_manager.h » ('j') | ash/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698