diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 04:45:55 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 04:45:55 +0000 |
| commit | 728c3dfc630a58b33be95efc467b529ed9519408 (patch) | |
| tree | 9bca26f639bd073888d80e34e0b461951228e9d4 | |
| parent | 339d794aa66fbf3a36717915a5417810451f15c5 (diff) | |
| download | chromium_src-728c3dfc630a58b33be95efc467b529ed9519408.zip chromium_src-728c3dfc630a58b33be95efc467b529ed9519408.tar.gz chromium_src-728c3dfc630a58b33be95efc467b529ed9519408.tar.bz2 | |
Only add 140 and 180 as supported scale factors if running in high-DPI mode.
BUG=180159
Review URL: https://chromiumcodereview.appspot.com/12486004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186364 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/base/layout.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index bb97fd1..024948c 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -23,6 +23,7 @@ #if defined(OS_WIN) #include "base/win/metro.h" +#include "ui/base/win/dpi.h" #include <Windows.h> #endif // defined(OS_WIN) @@ -122,8 +123,10 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { // 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); + if (ui::IsInHighDPIMode()) { + 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); |