cros: Use touch theme assets with --touch-optimized-ui
This follows the same pattern for theme_resources_touch_1x as we used for ui_resources_touch. I also introduced a gyp flag for enable_touch_ui at sky's suggestion.
BUG=115234
TEST=visual, run with --touch-optimized-ui and see bigger tabstrip and toolbar assets
Review URL: https://chromiumcodereview.appspot.com/10320002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134942 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 80a9e21..45cd2f8a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -43,6 +43,9 @@
# Enable HiDPI support.
'enable_hidpi%': 0,
+
+ # Enable touch optimized art assets and metrics.
+ 'enable_touch_ui%': 0,
# Enable inclusion of touch-optimized resources.
# TODO(joi): Rename to enable_touch_assets.
@@ -57,6 +60,7 @@
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
'enable_hidpi%': '<(enable_hidpi)',
+ 'enable_touch_ui%': '<(enable_touch_ui)',
'enable_metro%': '<(enable_metro)',
# Compute the architecture that we're building on.
@@ -96,6 +100,11 @@
['OS=="mac"', {
'enable_hidpi%': 1,
}],
+
+ # Enable touch UI on Metro and Chrome OS.
+ ['enable_metro==1 or chromeos==1', {
+ 'enable_touch_ui%': 1,
+ }],
],
},
@@ -110,6 +119,7 @@
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
'enable_hidpi%': '<(enable_hidpi)',
+ 'enable_touch_ui%': '<(enable_touch_ui)',
'enable_metro%': '<(enable_metro)',
# We used to provide a variable for changing how libraries were built.
@@ -512,6 +522,7 @@
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
'enable_hidpi%': '<(enable_hidpi)',
+ 'enable_touch_ui%': '<(enable_touch_ui)',
'enable_metro%': '<(enable_metro)',
'use_xi2_mt%':'<(use_xi2_mt)',
'file_manager_extension%': '<(file_manager_extension)',
