Chromium Code Reviews| Index: ash/display/display_manager.cc |
| diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc |
| index 2232b8a422d5f18469c98ccbcad57746901deade..3cd179852744e12aeef79e3721172160124feaba 100644 |
| --- a/ash/display/display_manager.cc |
| +++ b/ash/display/display_manager.cc |
| @@ -530,6 +530,7 @@ void DisplayManager::RegisterDisplayProperty( |
| float ui_scale, |
| const gfx::Insets* overscan_insets, |
| const gfx::Size& resolution_in_pixels, |
| + float device_scale_factor, |
| ui::ColorCalibrationProfile color_profile) { |
| if (display_info_.find(display_id) == display_info_.end()) |
| display_info_[display_id] = DisplayInfo(display_id, std::string(), false); |
| @@ -546,8 +547,9 @@ void DisplayManager::RegisterDisplayProperty( |
| if (!resolution_in_pixels.IsEmpty()) { |
|
oshima
2014/08/08 16:21:00
Can you add DCHECK to make sure display_id is not
Jun Mukai
2014/08/08 16:23:58
Done.
|
| // Default refresh rate, until OnNativeDisplaysChanged() updates us with the |
| // actual display info, is 60 Hz. |
| - display_modes_[display_id] = |
| - DisplayMode(resolution_in_pixels, 60.0f, false, false); |
| + DisplayMode mode(resolution_in_pixels, 60.0f, false, false); |
| + mode.device_scale_factor = device_scale_factor; |
| + display_modes_[display_id] = mode; |
| } |
| } |