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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/chromeos/screen_layout_observer_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/screen_util_unittest.cc ('K') | « ash/system/chromeos/screen_layout_observer.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/screen_layout_observer_unittest.cc
diff --git a/ash/system/chromeos/screen_layout_observer_unittest.cc b/ash/system/chromeos/screen_layout_observer_unittest.cc
index 905c4e22f71837d2f47e84d5a58ee5b56d0acf03..10a78c74bd46ce1c0638380d1e2c4ac4eb9e1d77 100644
--- a/ash/system/chromeos/screen_layout_observer_unittest.cc
+++ b/ash/system/chromeos/screen_layout_observer_unittest.cc
@@ -7,10 +7,8 @@
#include "ash/common/system/chromeos/devicetype_utils.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/test/test_system_tray_delegate.h"
-#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -18,6 +16,8 @@
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
+#include "ui/display/test/display_manager_test_api.h"
oshima 2016/10/24 19:29:16 ditto
rjkroege 2016/10/25 23:30:26 Done.
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
#include "ui/message_center/notification_list.h"
« ash/screen_util_unittest.cc ('K') | « ash/system/chromeos/screen_layout_observer.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698