Make ash::DisplayMode more like ui::DisplayMode

ash/display/resolution_notification_controller.h

 // 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.
 
 #ifndef ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 #define ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chromeos {
 FORWARD_DECLARE_TEST(DisplayPreferencesTest, PreventStore);
 }  // namespace chromeos
 
 namespace views {
 class Label;
 class Widget;
 }  // namespace views
 
 namespace ash {
 
-struct DisplayMode;
+class DisplayMode;
 
 // A class which manages the notification of display resolution change and
 // also manages the timeout in case the new resolution is unusable.
 class ASH_EXPORT ResolutionNotificationController
     : public display::DisplayObserver,
       public WindowTreeHostManager::Observer {
  public:
   ResolutionNotificationController();
   ~ResolutionNotificationController() override;
 
   // Prepare a resolution change notification for |display_id| from
   // |old_resolution| to |new_resolution|, which offers a button to revert the
   // change in case something goes wrong. The notification times out if there's
   // only one display connected and the user is trying to modify its resolution.
   // In that case, the timeout has to be set since the user cannot make any
   // changes if something goes wrong.
   //
   // This method does not create a notification itself. The notification will be
   // created the next OnDisplayConfigurationChanged(), which will be called
   // asynchronously after the resolution change is requested. So typically this
   // method will be combined with resolution change methods like
   // DisplayManager::SetDisplayMode().
   void 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);
 
   // Returns true if the notification is visible or scheduled to be visible and
   // the notification times out.
   bool DoesNotificationTimeout();
 
   // Called by the notification delegate when the user accepts the display
   // resolution change. Set |close_notification| to true when the notification
   // should be removed.
   void AcceptResolutionChange(bool close_notification);
@@ skipping 34 matching lines @@
   static void SuppressTimerForTest();
 
   std::unique_ptr<ResolutionChangeInfo> change_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ResolutionNotificationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_