Relocate display_manager from ash to ui

ash/display/resolution_notification_controller.cc

Index: ash/display/resolution_notification_controller.cc
diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc
index 262be584c32bce18da5a877bd3dce1bf95a1d695..6730004e680363a5406ba9aa1f83423ddbf09c72 100644
--- a/ash/display/resolution_notification_controller.cc
+++ b/ash/display/resolution_notification_controller.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
@@ -16,6 +15,7 @@
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/message_center/message_center.h"
@@ -138,7 +138,8 @@ ResolutionNotificationController::ResolutionChangeInfo::ResolutionChangeInfo(
       new_resolution(new_resolution),
       accept_callback(accept_callback),
       timeout_count(0) {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   if (!display::Display::HasInternalDisplay() &&
       display_manager->num_connected_displays() == 1u) {
     timeout_count = kTimeoutInSec;