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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller.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/unified_mouse_warp_controller_unittest.cc ('K') | « ash/magnifier/partial_magnification_controller_unittest.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 7dab8f73f96681c65d9b17cc50b23b5a4de6a3d9..85270d8f3b7f8e64fe19798f305e26b8a789cc13 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -38,7 +38,6 @@
#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/display/display_manager.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/host/ash_window_tree_host.h"
#include "ash/public/cpp/shelf_types.h"
@@ -67,6 +66,7 @@
#include "ui/aura/window_observer.h"
#include "ui/aura/window_tracker.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/screen.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
« ash/display/unified_mouse_warp_controller_unittest.cc ('K') | « ash/magnifier/partial_magnification_controller_unittest.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698