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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/touch/touch_hud_debug.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/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/test/display_manager_test_api.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_hud_debug.cc
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index b22d9cd9616976aadc06aea53a631926ea20650d..6c72ff4d31af8c17d3f0df5848a33c008780f0d3 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -8,7 +8,6 @@
#include <string>
#include <vector>
-#include "ash/display/display_manager.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "base/json/json_string_value_serializer.h"
@@ -18,6 +17,7 @@
#include "third_party/skia/include/core/SkPath.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/events/event.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/canvas.h"
« ash/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/test/display_manager_test_api.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698