diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /ui/base/layout.cc | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/layout.cc')
| -rw-r--r-- | ui/base/layout.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index fffa271..9e6be40 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -20,6 +20,7 @@ #endif // defined(OS_WIN) namespace { + // Helper function that determines whether we want to optimize the UI for touch. bool UseTouchOptimizedUI() { // If --touch-optimized-ui is specified and not set to "auto", then override @@ -54,6 +55,9 @@ bool UseTouchOptimizedUI() { return false; #endif } + +const float kScaleFactorScales[] = {1.0, 2.0}; + } namespace ui { @@ -75,4 +79,8 @@ DisplayLayout GetDisplayLayout() { #endif } +float GetScaleFactorScale(ScaleFactor scale_factor) { + return kScaleFactorScales[scale_factor]; +} + } // namespace ui |