diff options
Diffstat (limited to 'ui/base/layout.cc')
| -rw-r--r-- | ui/base/layout.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index a0381592..bb97fd1 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -118,11 +118,12 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { #elif defined(OS_MACOSX) if (base::mac::IsOSLionOrLater()) supported_scale_factors->push_back(SCALE_FACTOR_200P); -#elif defined(OS_WIN) && defined(ENABLE_HIDPI) - if (base::win::IsMetroProcess() && ui::IsTouchDevicePresent()) { - supported_scale_factors->push_back(SCALE_FACTOR_140P); - supported_scale_factors->push_back(SCALE_FACTOR_180P); - } +#elif defined(OS_WIN) + // Have high-DPI resources for 140% and 180% scaling on Windows based on + // default scaling for Metro mode. Round to nearest supported scale in + // all cases. + supported_scale_factors->push_back(SCALE_FACTOR_140P); + supported_scale_factors->push_back(SCALE_FACTOR_180P); #elif defined(OS_CHROMEOS) // TODO(oshima): Include 200P only if the device support 200P supported_scale_factors->push_back(SCALE_FACTOR_200P); |