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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_configuration_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/accelerators/accelerator_controller_unittest.cc ('K') | « ash/display/display_configuration_controller.h ('k') | ash/display/display_manager.h » ('j') | ash/display/display_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller.cc
diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
index 2a989cbc9e593d4297f30b8f70282656250a8798..5184530f6620e42ebd8b819e1225ccacd146df45 100644
--- a/ash/display/display_configuration_controller.cc
+++ b/ash/display/display_configuration_controller.cc
@@ -5,11 +5,11 @@
#include "ash/display/display_configuration_controller.h"
#include "ash/display/display_animator.h"
-#include "ash/display/display_manager.h"
#include "ash/display/display_util.h"
#include "ash/rotator/screen_rotation_animator.h"
#include "base/time/time.h"
#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager.h"
#if defined(OS_CHROMEOS)
#include "ash/display/display_animator_chromeos.h"
@@ -51,7 +51,7 @@ class DisplayConfigurationController::DisplayChangeLimiter {
};
DisplayConfigurationController::DisplayConfigurationController(
- DisplayManager* display_manager,
+ display::DisplayManager* display_manager,
WindowTreeHostManager* window_tree_host_manager)
: display_manager_(display_manager),
window_tree_host_manager_(window_tree_host_manager),
« ash/accelerators/accelerator_controller_unittest.cc ('K') | « ash/display/display_configuration_controller.h ('k') | ash/display/display_manager.h » ('j') | ash/display/display_util_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698