diff options
| author | huangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 17:52:02 +0000 |
|---|---|---|
| committer | huangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 17:52:02 +0000 |
| commit | a27ef629458d52f24a7c5ee50eb9bb01fbfcecfd (patch) | |
| tree | ebf5b93567464db65def73b078d405c4d3bb79e8 /ui/base/layout.cc | |
| parent | 8e03623680bd7a767553ff56c7fe4bd0bf9e9352 (diff) | |
| download | chromium_src-a27ef629458d52f24a7c5ee50eb9bb01fbfcecfd.zip chromium_src-a27ef629458d52f24a7c5ee50eb9bb01fbfcecfd.tar.gz chromium_src-a27ef629458d52f24a7c5ee50eb9bb01fbfcecfd.tar.bz2 | |
Updating support files for new high DPI touch assets.
resource_bundle_win.cc: ResourceBundle::LoadCommonResources() should be updated, but this requires decisions on what scaling ranges will use 140% and 180%.
BUG=141048
Review URL: https://chromiumcodereview.appspot.com/10928005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/layout.cc')
| -rw-r--r-- | ui/base/layout.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index a7e6d46..ffc7082 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -60,7 +60,9 @@ bool UseTouchOptimizedUI() { #endif } -const float kScaleFactorScales[] = {1.0, 2.0}; +const float kScaleFactorScales[] = {1.0f, 1.4f, 1.8f, 2.0f}; +COMPILE_ASSERT(ui::NUM_SCALE_FACTORS == arraysize(kScaleFactorScales), + kScaleFactorScales_incorrect_size); const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales); std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() { @@ -71,6 +73,11 @@ std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() { #if defined(OS_MACOSX) && defined(ENABLE_HIDPI) if (base::mac::IsOSLionOrLater()) supported_scale_factors->push_back(ui::SCALE_FACTOR_200P); +#elif defined(OS_WIN) && defined(ENABLE_HIDPI) + if (base::win::IsMetroProcess() && base::win::IsTouchEnabled()) { + supported_scale_factors->push_back(ui::SCALE_FACTOR_140P); + supported_scale_factors->push_back(ui::SCALE_FACTOR_180P); + } #elif defined(USE_ASH) supported_scale_factors->push_back(ui::SCALE_FACTOR_200P); #endif |