Chromium Code Reviews| Index: chrome/browser/chromeos/display/display_preferences.cc |
| diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc |
| index ab7697bde0ae4358ad98519c06c7b3670951d484..1e2f5cf7d1c7112d5d509dd67197625844151f74 100644 |
| --- a/chrome/browser/chromeos/display/display_preferences.cc |
| +++ b/chrome/browser/chromeos/display/display_preferences.cc |
| @@ -135,8 +135,10 @@ void LoadDisplayProperties() { |
| ui_scale = static_cast<float>(ui_scale_value) / 1000.0f; |
| int width = 0, height = 0; |
| + double refresh_rate; |
| dict_value->GetInteger("width", &width); |
| dict_value->GetInteger("height", &height); |
| + dict_value->GetDouble("refresh-rate", &refresh_rate); |
|
oshima
2014/01/27 18:53:22
Unless you want to use this to select output mode,
sheu
2014/01/28 21:30:42
My problem here is that RegisterDisplayProperty cr
oshima
2014/01/28 22:17:08
I believe your problem was that you didn't add the
sheu
2014/01/29 00:14:10
I've added a default, but I'm not sure what you me
oshima
2014/01/29 01:15:26
Maybe I misread the code, but if you indeed added
|
| gfx::Size resolution_in_pixels(width, height); |
| gfx::Insets insets; |
| @@ -146,7 +148,8 @@ void LoadDisplayProperties() { |
| rotation, |
| ui_scale, |
| insets_to_set, |
| - resolution_in_pixels); |
| + resolution_in_pixels, |
| + refresh_rate); |
| } |
| } |
| @@ -200,10 +203,13 @@ void StoreCurrentDisplayProperties() { |
| "ui-scale", |
| static_cast<int>(info.configured_ui_scale() * 1000)); |
| gfx::Size resolution; |
| + float refresh_rate; |
| if (!display.IsInternal() && |
| - display_manager->GetSelectedResolutionForDisplayId(id, &resolution)) { |
| + display_manager->GetSelectedResolutionForDisplayId( |
| + id, &resolution, &refresh_rate)) { |
| property_value->SetInteger("width", resolution.width()); |
| property_value->SetInteger("height", resolution.height()); |
| + property_value->SetDouble("refresh-rate", refresh_rate); |
| } |
| if (!info.overscan_insets_in_dip().empty()) |