Make ash::DisplayMode more like ui::DisplayMode

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"
@@ skipping 76 matching lines @@
 
 // static
 const int ResolutionNotificationController::kTimeoutInSec = 15;
 
 // static
 const char ResolutionNotificationController::kNotificationId[] =
     "chrome://settings/display/resolution";
 
 struct ResolutionNotificationController::ResolutionChangeInfo {
   ResolutionChangeInfo(int64_t display_id,
-                       const DisplayMode& old_resolution,
-                       const DisplayMode& new_resolution,
+                       const scoped_refptr<DisplayMode>& old_resolution,
+                       const scoped_refptr<DisplayMode>& 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.
-  DisplayMode old_resolution;
+  scoped_refptr<DisplayMode> old_resolution;
 
   // The requested resolution. Note that this may be different from
   // |current_resolution| which is the actual resolution set.
-  DisplayMode new_resolution;
+  scoped_refptr<DisplayMode> new_resolution;
 
   // The actual resolution after the change.
-  DisplayMode current_resolution;
+  scoped_refptr<DisplayMode> 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 DisplayMode& old_resolution,
-    const DisplayMode& new_resolution,
+    const scoped_refptr<DisplayMode>& old_resolution,
+    const scoped_refptr<DisplayMode>& 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;
   }
 }
 
 ResolutionNotificationController::ResolutionChangeInfo::
-    ~ResolutionChangeInfo() {}
+    ~ResolutionChangeInfo() {
+  old_resolution = nullptr;
+  new_resolution = nullptr;
+  current_resolution = nullptr;
+}
 
 ResolutionNotificationController::ResolutionNotificationController() {
   Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
   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 DisplayMode& old_resolution,
-    const DisplayMode& new_resolution,
+    const scoped_refptr<DisplayMode>& old_resolution,
+    const scoped_refptr<DisplayMode>& 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|.
-  DisplayMode original_resolution;
+  scoped_refptr<DisplayMode> original_resolution;
   if (change_info_ && change_info_->display_id == display_id) {
-    DCHECK(change_info_->new_resolution.size == old_resolution.size);
+    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.size.IsEmpty())
+  if (original_resolution && !original_resolution->size().IsEmpty())
     change_info_->old_resolution = original_resolution;
 }
 
 bool ResolutionNotificationController::DoesNotificationTimeout() {
   return change_info_ && change_info_->timeout_count > 0;
 }
 
 void ResolutionNotificationController::CreateOrUpdateNotification(
     bool enable_spoken_feedback) {
   message_center::MessageCenter* message_center =
@@ skipping 16 matching lines @@
   }
   data.buttons.push_back(message_center::ButtonInfo(
       l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_RESOLUTION_CHANGE_REVERT)));
 
   data.should_make_spoken_feedback_for_popup_updates = enable_spoken_feedback;
 
   const base::string16 display_name = base::UTF8ToUTF16(
       Shell::GetInstance()->display_manager()->GetDisplayNameForId(
           change_info_->display_id));
   const base::string16 message =
-      (change_info_->new_resolution.size ==
-       change_info_->current_resolution.size)
+      (change_info_->new_resolution->size() ==
+       change_info_->current_resolution->size())
           ? l10n_util::GetStringFUTF16(
                 IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED, display_name,
-                base::UTF8ToUTF16(change_info_->new_resolution.size.ToString()))
+                base::UTF8ToUTF16(
+                    change_info_->new_resolution->size().ToString()))
           : l10n_util::GetStringFUTF16(
                 IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED_TO_UNSUPPORTED,
                 display_name,
-                base::UTF8ToUTF16(change_info_->new_resolution.size.ToString()),
                 base::UTF8ToUTF16(
-                    change_info_->current_resolution.size.ToString()));
+                    change_info_->new_resolution->size().ToString()),
+                base::UTF8ToUTF16(
+                    change_info_->current_resolution->size().ToString()));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   std::unique_ptr<Notification> notification(new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId, message,
       timeout_message, bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
       base::string16() /* display_source */, GURL(),
       message_center::NotifierId(
           message_center::NotifierId::SYSTEM_COMPONENT,
           system_notifier::kNotifierDisplayResolutionChange),
       data, new ResolutionChangeNotificationDelegate(
@@ skipping 25 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;
-  DisplayMode old_resolution = change_info_->old_resolution;
+  scoped_refptr<DisplayMode> 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(
     const display::Display& old_display) {
@@ skipping 17 matching lines @@
     change_info_->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace ash