diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 17:03:18 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 17:03:18 +0000 |
| commit | 2cc81d3575eedeec1c727cd0381b366f76702f70 (patch) | |
| tree | 911b3d50d2a7dce7f55d2c6d83f683caa29a7913 /build | |
| parent | 8d86f13d2e87cc58739121d40dd698122707878e (diff) | |
| download | chromium_src-2cc81d3575eedeec1c727cd0381b366f76702f70.zip chromium_src-2cc81d3575eedeec1c727cd0381b366f76702f70.tar.gz chromium_src-2cc81d3575eedeec1c727cd0381b366f76702f70.tar.bz2 | |
Separate Virtual Keyboard related conditionals from TouchUI
Add a gyp variable use_virtual_keyboard
Add a cpp define USE_VIRTUAL_KEYBOARD
Add a grit define use_virtual_keyboard
BUG=chromium-os:10620
TEST=chrome and browser_tests compile successfully with GYP_DEFINES="touchui=1" and GYP_DEFINES="use_virtual_keyboard=1 use_only_pure_views=1". they run with a virtual keyboard with command-line option --views-desktop
Review URL: http://codereview.chromium.org/8051010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 77047a1..2df9b36 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -74,6 +74,13 @@ 'use_only_pure_views%': 0, }], + # Use virtual keyboard by default in TouchUI builds. + ['touchui==1', { + 'use_virtual_keyboard%': 1, + }, { + 'use_virtual_keyboard%': 0, + }], + # Use the views compositor when using the Aura window manager or # touch. ['use_aura==1 or touchui==1', { @@ -85,6 +92,7 @@ # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', + 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', 'use_only_pure_views%': '<(use_only_pure_views)', @@ -330,6 +338,7 @@ 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', + 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'use_xi2_mt%':'<(use_xi2_mt)', 'file_manager_extension%': '<(file_manager_extension)', 'webui_task_manager%': '<(webui_task_manager)', @@ -764,6 +773,9 @@ ['touchui==1', { 'grit_defines': ['-D', 'touchui'], }], + ['use_virtual_keyboard==1', { + 'grit_defines': ['-D', 'use_virtual_keyboard'], + }], ['file_manager_extension==1', { 'grit_defines': ['-D', 'file_manager_extension'], }], @@ -901,6 +913,9 @@ ['touchui==1', { 'defines': ['TOUCH_UI=1'], }], + ['use_virtual_keyboard==1', { + 'defines': ['USE_VIRTUAL_KEYBOARD=1'], + }], ['use_xi2_mt!=0', { 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], }], |