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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/dip_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/accelerators/accelerator_controller_unittest.cc ('K') | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/display/cursor_window_controller.cc » ('j') | ash/display/display_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/dip_unittest.cc
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 4c553dcd98b784642e0e90ccbe73dc6886a7d746..3dc292395329d7dbb850969b310eec2b656e1f6b 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -8,7 +8,6 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
-#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_md_test_base.h"
#include "ash/wm/window_properties.h"
@@ -18,6 +17,7 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/compositor/layer.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/views/widget/widget.h"
« ash/accelerators/accelerator_controller_unittest.cc ('K') | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/display/cursor_window_controller.cc » ('j') | ash/display/display_util_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698