Relocate display_manager from ash to ui

ash/display/resolution_notification_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/resolution_notification_controller.h"
 
 #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"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #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"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 
 using message_center::Notification;
 
 namespace ash {
 namespace {
@@ skipping 102 matching lines @@
 ResolutionNotificationController::ResolutionChangeInfo::ResolutionChangeInfo(
     int64_t display_id,
     const scoped_refptr<display::ManagedDisplayMode>& old_resolution,
     const scoped_refptr<display::ManagedDisplayMode>& new_resolution,
     const base::Closure& accept_callback)
     : display_id(display_id),
       old_resolution(old_resolution),
       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;
   }
 }
 
 ResolutionNotificationController::ResolutionChangeInfo::
     ~ResolutionChangeInfo() {
   old_resolution = nullptr;
   new_resolution = nullptr;
@@ skipping 157 matching lines @@
     change_info_->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace ash