Move ash::DisplayInfo 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/display/display_info.h"
 #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_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 56 matching lines @@
 }  // namespace
 
 // static
 const int ResolutionNotificationController::kTimeoutInSec = 15;
 
 // static
 const char ResolutionNotificationController::kNotificationId[] =
     "chrome://settings/display/resolution";
 
 struct ResolutionNotificationController::ResolutionChangeInfo {
-  ResolutionChangeInfo(int64_t display_id,
-                       const scoped_refptr<ManagedDisplayMode>& old_resolution,
-                       const scoped_refptr<ManagedDisplayMode>& new_resolution,
-                       const base::Closure& accept_callback);
+  ResolutionChangeInfo(
+      int64_t display_id,
+      const scoped_refptr<ui::ManagedDisplayMode>& old_resolution,
+      const scoped_refptr<ui::ManagedDisplayMode>& new_resolution,
+      const base::Closure& accept_callback);
   ~ResolutionChangeInfo();
 
   // The id of the display where the resolution change happens.
   int64_t display_id;
 
   // The resolution before the change.
-  scoped_refptr<ManagedDisplayMode> old_resolution;
+  scoped_refptr<ui::ManagedDisplayMode> old_resolution;
 
   // The requested resolution. Note that this may be different from
   // |current_resolution| which is the actual resolution set.
-  scoped_refptr<ManagedDisplayMode> new_resolution;
+  scoped_refptr<ui::ManagedDisplayMode> new_resolution;
 
   // The actual resolution after the change.
-  scoped_refptr<ManagedDisplayMode> current_resolution;
+  scoped_refptr<ui::ManagedDisplayMode> current_resolution;
 
   // The callback when accept is chosen.
   base::Closure accept_callback;
 
   // The remaining timeout in seconds. 0 if the change does not time out.
   uint8_t timeout_count;
 
   // The timer to invoke OnTimerTick() every second. This cannot be
   // OneShotTimer since the message contains text "automatically closed in xx
   // seconds..." which has to be updated every second.
   base::RepeatingTimer timer;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResolutionChangeInfo);
 };
 
 ResolutionNotificationController::ResolutionChangeInfo::ResolutionChangeInfo(
     int64_t display_id,
-    const scoped_refptr<ManagedDisplayMode>& old_resolution,
-    const scoped_refptr<ManagedDisplayMode>& new_resolution,
+    const scoped_refptr<ui::ManagedDisplayMode>& old_resolution,
+    const scoped_refptr<ui::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();
   if (!display::Display::HasInternalDisplay() &&
       display_manager->num_connected_displays() == 1u) {
     timeout_count = kTimeoutInSec;
@@ skipping 12 matching lines @@
   display::Screen::GetScreen()->AddObserver(this);
 }
 
 ResolutionNotificationController::~ResolutionNotificationController() {
   Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void ResolutionNotificationController::PrepareNotification(
     int64_t display_id,
-    const scoped_refptr<ManagedDisplayMode>& old_resolution,
-    const scoped_refptr<ManagedDisplayMode>& new_resolution,
+    const scoped_refptr<ui::ManagedDisplayMode>& old_resolution,
+    const scoped_refptr<ui::ManagedDisplayMode>& new_resolution,
     const base::Closure& accept_callback) {
   DCHECK(old_resolution);
   DCHECK(new_resolution);
 
   DCHECK(!display::Display::IsInternalDisplayId(display_id));
   // If multiple resolution changes are invoked for the same display,
   // the original resolution for the first resolution change has to be used
   // instead of the specified |old_resolution|.
-  scoped_refptr<ManagedDisplayMode> original_resolution;
+  scoped_refptr<ui::ManagedDisplayMode> original_resolution;
   if (change_info_ && change_info_->display_id == display_id) {
     DCHECK(change_info_->new_resolution->size() == old_resolution->size());
     original_resolution = change_info_->old_resolution;
   }
 
   change_info_.reset(new ResolutionChangeInfo(display_id, old_resolution,
                                               new_resolution, accept_callback));
   if (original_resolution && !original_resolution->size().IsEmpty())
     change_info_->old_resolution = original_resolution;
 }
@@ skipping 82 matching lines @@
   change_info_.reset();
   callback.Run();
 }
 
 void ResolutionNotificationController::RevertResolutionChange() {
   message_center::MessageCenter::Get()->RemoveNotification(kNotificationId,
                                                            false /* by_user */);
   if (!change_info_)
     return;
   int64_t display_id = change_info_->display_id;
-  scoped_refptr<ManagedDisplayMode> old_resolution =
+  scoped_refptr<ui::ManagedDisplayMode> old_resolution =
       change_info_->old_resolution;
   change_info_.reset();
   Shell::GetInstance()->display_manager()->SetDisplayMode(display_id,
                                                           old_resolution);
 }
 
 void ResolutionNotificationController::OnDisplayAdded(
     const display::Display& new_display) {}
 
 void ResolutionNotificationController::OnDisplayRemoved(
@@ skipping 18 matching lines @@
     change_info_->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace ash