Relocate display_manager from ash to ui

ash/system/chromeos/screen_layout_observer.cc

 // Copyright (c) 2012 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/system/chromeos/screen_layout_observer.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_notification_view.h"
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/strings/string_util.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/resource/resource_bundle.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.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 {
 
-DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
 base::string16 GetDisplayName(int64_t display_id) {
   return base::UTF8ToUTF16(
       GetDisplayManager()->GetDisplayNameForId(display_id));
 }
 
 base::string16 GetDisplaySize(int64_t display_id) {
-  DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
 
   const display::Display* display =
       &display_manager->GetDisplayForId(display_id);
 
   // We don't show display size for mirrored display. Fallback
   // to empty string if this happens on release build.
   bool mirroring = display_manager->mirroring_display_id() == display_id;
   DCHECK(!mirroring);
   if (mirroring)
     return base::string16();
@@ skipping 33 matching lines @@
       UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SELECTED);
   if (OpenSettings()) {
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SHOW_SETTINGS);
   }
 }
 
 // Returns the name of the currently connected external display. This should not
 // be used when the external display is used for mirroring.
 base::string16 GetExternalDisplayName() {
-  DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   DCHECK(!display_manager->IsInMirrorMode());
 
   int64_t external_id = display::Display::kInvalidDisplayID;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     int64_t id = display_manager->GetDisplayAt(i).id();
     if (!display::Display::IsInternalDisplayId(id)) {
       external_id = id;
       break;
     }
   }
@@ skipping 17 matching lines @@
     name = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME, name,
         l10n_util::GetStringUTF16(
             IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION_OVERSCAN));
   }
 
   return name;
 }
 
 base::string16 GetDisplayMessage(base::string16* additional_message_out) {
-  DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   if (display_manager->GetNumDisplays() > 1) {
     if (display::Display::HasInternalDisplay()) {
       return l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
                                         GetExternalDisplayName());
     }
     return l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL);
   }
 
   if (display_manager->IsInMirrorMode()) {
@@ skipping 35 matching lines @@
 ScreenLayoutObserver::~ScreenLayoutObserver() {
   WmShell::Get()->RemoveDisplayObserver(this);
 }
 
 void ScreenLayoutObserver::UpdateDisplayInfo(
     ScreenLayoutObserver::DisplayInfoMap* old_info) {
   if (old_info)
     old_info->swap(display_info_);
   display_info_.clear();
 
-  DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     int64_t id = display_manager->GetDisplayAt(i).id();
     display_info_[id] = display_manager->GetDisplayInfo(id);
   }
 }
 
 bool ScreenLayoutObserver::GetDisplayMessageForNotification(
     const ScreenLayoutObserver::DisplayInfoMap& old_info,
     base::string16* message_out,
     base::string16* additional_message_out) {
@@ skipping 94 matching lines @@
   if (!show_notifications_for_testing)
     return;
 
   base::string16 message;
   base::string16 additional_message;
   if (GetDisplayMessageForNotification(old_info, &message, &additional_message))
     CreateOrUpdateNotification(message, additional_message);
 }
 
 }  // namespace ash