diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 17:22:24 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 17:22:24 +0000 |
| commit | 9c8ea3bf49845e4b082a680f9f0bf759c07f2f34 (patch) | |
| tree | a4d81a9394fb4c7599315103807600c8e5734c97 /ui/base/layout.cc | |
| parent | 504f1dd22013ca7ce82f25ddbaec1fe2c0409778 (diff) | |
| download | chromium_src-9c8ea3bf49845e4b082a680f9f0bf759c07f2f34.zip chromium_src-9c8ea3bf49845e4b082a680f9f0bf759c07f2f34.tar.gz chromium_src-9c8ea3bf49845e4b082a680f9f0bf759c07f2f34.tar.bz2 | |
Fix loading of high-DPI resources for Windows.
BUG=159730
Review URL: https://chromiumcodereview.appspot.com/12378019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185718 0039d316-1c4b-4281-b951-d872f2087c98
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); |