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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/overview/overview_button_tray_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/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/system/chromeos/screen_layout_observer_unittest.cc ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index dd07e153935130d831335da766ee5e6a728d86e0..fd6f3645af99b46947778cc636b88105b5a1c381 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -10,7 +10,6 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/root_window_controller.h"
#include "ash/rotator/screen_rotation_animator.h"
@@ -24,6 +23,7 @@
#include "ui/aura/window.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/display/display_switches.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "ui/events/gestures/gesture_types.h"
« ash/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/system/chromeos/screen_layout_observer_unittest.cc ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698