Make ash::DisplayMode more like ui::DisplayMode

chrome/browser/chromeos/display/display_preferences.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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include <stddef.h>
 
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
@@ skipping 248 matching lines @@
     // Don't save the display preference in unified mode because its
     // size and modes can change depending on the combination of displays.
     if (display_manager->IsInUnifiedMode())
       continue;
     property_value->SetInteger("rotation",
                                static_cast<int>(info.GetRotation(
                                    display::Display::ROTATION_SOURCE_USER)));
     property_value->SetInteger(
         "ui-scale", static_cast<int>(info.configured_ui_scale() * 1000));
 
-    ash::DisplayMode mode;
-    if (!display.IsInternal() &&
-        display_manager->GetSelectedModeForDisplayId(id, &mode) &&
-        !mode.native) {
-      property_value->SetInteger("width", mode.size.width());
-      property_value->SetInteger("height", mode.size.height());
+    scoped_refptr<ash::DisplayMode> mode =
+        display_manager->GetSelectedModeForDisplayId(id);
+    if (!display.IsInternal() && mode && !mode->native()) {
+      property_value->SetInteger("width", mode->size().width());
+      property_value->SetInteger("height", mode->size().height());
       property_value->SetInteger(
           "device-scale-factor",
-          static_cast<int>(mode.device_scale_factor * 1000));
+          static_cast<int>(mode->device_scale_factor() * 1000));
     }
     if (!info.overscan_insets_in_dip().IsEmpty())
       InsetsToValue(info.overscan_insets_in_dip(), property_value.get());
     if (info.color_profile() != ui::COLOR_PROFILE_STANDARD) {
       property_value->SetString(
           "color_profile_name", ColorProfileToString(info.color_profile()));
     }
     pref_data->Set(base::Int64ToString(id), property_value.release());
   }
 }
@@ skipping 106 matching lines @@
                                    const display::DisplayLayout& layout) {
   StoreDisplayLayoutPref(list, layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos