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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.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/screen_util_unittest.cc ('K') | « ash/shell.h ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | ash/system/chromeos/screen_layout_observer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index afccf4f56a189b9a33464ffe0114a7e2aa6d9947..201c55f9918ac7cb657a633940d185d31abe21fa 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -40,7 +40,6 @@
#include "ash/common/wm_shell.h"
#include "ash/display/cursor_window_controller.h"
#include "ash/display/display_configuration_controller.h"
-#include "ash/display/display_manager.h"
#include "ash/display/event_transformation_handler.h"
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/display/screen_ash.h"
@@ -90,6 +89,7 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animator.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/screen.h"
#include "ui/events/event_target_iterator.h"
#include "ui/gfx/geometry/size.h"
« ash/screen_util_unittest.cc ('K') | « ash/shell.h ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | ash/system/chromeos/screen_layout_observer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698