diff options
Diffstat (limited to 'chromium/ui/display/manager/display_change_observer.cc')
-rw-r--r-- | chromium/ui/display/manager/display_change_observer.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chromium/ui/display/manager/display_change_observer.cc b/chromium/ui/display/manager/display_change_observer.cc index 8bc5730e274..249c7e49278 100644 --- a/chromium/ui/display/manager/display_change_observer.cc +++ b/chromium/ui/display/manager/display_change_observer.cc @@ -429,11 +429,15 @@ float DisplayChangeObserver::FindDeviceScaleFactor( float dpi, const gfx::Size& size_in_pixels) { // Nocturne has special scale factor 3000/1332=2.252.. for the panel 3kx2k. - constexpr gfx::Size k225DisplaySizeHack(3000, 2000); + constexpr gfx::Size k225DisplaySizeHackNocturne(3000, 2000); + // Keep the Chell's scale factor 2.252 until we make decision. + constexpr gfx::Size k2DisplaySizeHackChell(3200, 1800); - if (size_in_pixels == k225DisplaySizeHack) + if (size_in_pixels == k225DisplaySizeHackNocturne) { return kDsf_2_252; - else { + } else if (size_in_pixels == k2DisplaySizeHackChell) { + return 2.f; + } else { for (size_t i = 0; i < base::size(kThresholdTableForInternal); ++i) { if (dpi >= kThresholdTableForInternal[i].dpi) return kThresholdTableForInternal[i].device_scale_factor; |