Index: ash/display/display_change_observer_chromeos.cc |
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc |
index fd2a66d1fa86e2aeb367725a758722e11a40b590..c35f380ee15c7244c71de478c193d017b162c7b3 100644 |
--- a/ash/display/display_change_observer_chromeos.cc |
+++ b/ash/display/display_change_observer_chromeos.cc |
@@ -187,12 +187,11 @@ void DisplayChangeObserver::OnDisplayModeChanged( |
continue; |
float device_scale_factor = 1.0f; |
+ float dpi = |
+ kInchInMm * mode_info->size().width() / state->physical_size().width(); |
oshima
2015/09/21 23:11:51
can you check the blacklist and simply set it to z
bshe
2015/09/22 00:20:24
Done.
|
if (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) { |
- if (!ui::IsDisplaySizeBlackListed(state->physical_size())) { |
- device_scale_factor = |
- FindDeviceScaleFactor((kInchInMm * mode_info->size().width() / |
- state->physical_size().width())); |
- } |
+ if (!ui::IsDisplaySizeBlackListed(state->physical_size())) |
+ device_scale_factor = FindDeviceScaleFactor(dpi); |
} else { |
DisplayMode mode; |
if (Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId( |
@@ -234,6 +233,11 @@ void DisplayChangeObserver::OnDisplayModeChanged( |
new_info.set_native(true); |
new_info.set_is_aspect_preserving_scaling( |
state->is_aspect_preserving_scaling()); |
+ if (!ui::IsDisplaySizeBlackListed(state->physical_size())) { |
+ // Only sets dpi if the size is not black listed. Otherwise, use the |
+ // default dpi 96.0. |
+ new_info.set_device_dpi(dpi); |
+ } |
std::vector<DisplayMode> display_modes = |
(state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) |