diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 05:55:15 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 05:55:15 +0000 |
| commit | da5f1955339764e021b24ac0e9abfb89e3160ded (patch) | |
| tree | 9ebc58f5208307f15903bb05b43614afd50fb5bd /build | |
| parent | bbbe7f464b4c47292a44076ed9e06a1a437ce08b (diff) | |
| download | chromium_src-da5f1955339764e021b24ac0e9abfb89e3160ded.zip chromium_src-da5f1955339764e021b24ac0e9abfb89e3160ded.tar.gz chromium_src-da5f1955339764e021b24ac0e9abfb89e3160ded.tar.bz2 | |
Remove virtual keyboard support:
1. common.gypi: use_virtual_keyboard define
2. Any code controlled by that define
3. chrome/browser/ui/virtual_keyboard/*
4. chrome/browser/resources/keyboard/*
5. experimental extension APIs for virtual keyboard
No user-visible changes.
BUG=128295
TEST=try
Review URL: https://chromiumcodereview.appspot.com/10399046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5407b85..d4d1cbb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -32,8 +32,7 @@ # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 'use_openssl%': 0, - # Disable Virtual keyboard support by default. - 'use_virtual_keyboard%': 0, + 'use_ibus%': 0, # Disable viewport meta tag by default. 'enable_viewport%': 0, @@ -68,7 +67,7 @@ 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', - 'use_virtual_keyboard%': '<(use_virtual_keyboard)', + 'use_ibus%': '<(use_ibus)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', 'enable_touch_ui%': '<(enable_touch_ui)', @@ -131,7 +130,7 @@ 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', - 'use_virtual_keyboard%': '<(use_virtual_keyboard)', + 'use_ibus%': '<(use_ibus)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', 'enable_touch_ui%': '<(enable_touch_ui)', @@ -517,6 +516,7 @@ 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', + 'use_ibus%': '<(use_ibus)', 'use_nss%': '<(use_nss)', 'os_bsd%': '<(os_bsd)', 'os_posix%': '<(os_posix)', @@ -529,7 +529,6 @@ 'enable_pepper_threading%': '<(enable_pepper_threading)', 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)', 'chromeos%': '<(chromeos)', - 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', 'enable_touch_ui%': '<(enable_touch_ui)', @@ -1060,9 +1059,6 @@ ['use_nss==1', { 'grit_defines': ['-D', 'use_nss'], }], - ['use_virtual_keyboard==1', { - 'grit_defines': ['-D', 'use_virtual_keyboard'], - }], ['file_manager_extension==1', { 'grit_defines': ['-D', 'file_manager_extension'], }], @@ -1113,13 +1109,6 @@ ], }], - # Set use_ibus to 1 to enable ibus support. - ['use_virtual_keyboard==1 and chromeos==1', { - 'use_ibus%': 1, - }, { - 'use_ibus%': 0, - }], - ['enable_web_intents_tag==1', { 'grit_defines': ['-D', 'enable_web_intents_tag'], }], @@ -1310,9 +1299,6 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], - ['use_virtual_keyboard==1', { - 'defines': ['USE_VIRTUAL_KEYBOARD=1'], - }], ['use_xi2_mt!=0', { 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], }], |