| Index: ash/display/display_manager.cc
|
| diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
|
| index 5252679f1968eedc50ddcfdf42031744d37d9509..84051a191bb5bf02f50b2949d92d572dd0c982c1 100644
|
| --- a/ash/display/display_manager.cc
|
| +++ b/ash/display/display_manager.cc
|
| @@ -237,14 +237,14 @@ void DisplayManager::InitDefaultDisplay() {
|
| OnNativeDisplaysChanged(info_list);
|
| }
|
|
|
| -void DisplayManager::InitFontParams() {
|
| +void DisplayManager::RefreshFontParams() {
|
| #if defined(OS_CHROMEOS)
|
| - if (!HasInternalDisplay())
|
| - return;
|
| - const DisplayInfo& display_info =
|
| - GetDisplayInfo(gfx::Display::InternalDisplayId());
|
| - gfx::SetFontRenderParamsDeviceScaleFactor(
|
| - display_info.GetEffectiveDeviceScaleFactor());
|
| + float device_scale_factor = 1.0f;
|
| + if (HasInternalDisplay()) {
|
| + device_scale_factor = GetDisplayInfo(gfx::Display::InternalDisplayId())
|
| + .GetEffectiveDeviceScaleFactor();
|
| + }
|
| + gfx::SetFontRenderParamsDeviceScaleFactor(device_scale_factor);
|
| #endif // OS_CHROMEOS
|
| }
|
|
|
| @@ -904,6 +904,7 @@ void DisplayManager::UpdateDisplays(
|
|
|
| displays_ = new_displays;
|
|
|
| + RefreshFontParams();
|
| base::AutoReset<bool> resetter(&change_display_upon_host_resize_, false);
|
|
|
| // Temporarily add displays to be removed because display object
|
|
|