Change TOUCH_UI => USE_VIRTUAL_KEYBOARD.

BUG=105046
TEST=tests still run (or rather don't run for VK builds)


Review URL: http://codereview.chromium.org/8653001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111893 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 67 insertions, 66 deletions

diff --git a/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc b/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
index 9ee8cea..76c5749 100644
--- a/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
+++ b/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
@@ -8,13 +8,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(TOUCH_UI)
-// Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests
-// for now.
+#if defined(USE_VIRTUAL_KEYBOARD)
+// Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
+// skip the tests for now.
 #define TestCreateInputMethodDescriptor DISABLED_TestCreateInputMethodDescriptor
 #define TestInputMethodIdIsWhitelisted DISABLED_TestInputMethodIdIsWhitelisted
 #define TestXkbLayoutIsSupported DISABLED_TestXkbLayoutIsSupported
-#endif  // TOUCH_UI
+#endif  // USE_VIRTUAL_KEYBOARD
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/input_method/ibus_input_methods.txt b/chrome/browser/chromeos/input_method/ibus_input_methods.txt
index 594993f..9e56521 100644
--- a/chrome/browser/chromeos/input_method/ibus_input_methods.txt
+++ b/chrome/browser/chromeos/input_method/ibus_input_methods.txt
@@ -47,40 +47,40 @@
 
 # U.S. English
 xkb:us::eng	us	eng
-xkb:us:intl:eng	us(intl)	eng	!defined(TOUCH_UI)
-xkb:us:altgr-intl:eng	us(altgr-intl)	eng	!defined(TOUCH_UI)
-xkb:us:dvorak:eng	us(dvorak)	eng	!defined(TOUCH_UI)
-xkb:us:colemak:eng	us(colemak)	eng	!defined(TOUCH_UI)
-english-m	us	en-US	!defined(TOUCH_UI)
+xkb:us:intl:eng	us(intl)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:us:altgr-intl:eng	us(altgr-intl)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:us:dvorak:eng	us(dvorak)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:us:colemak:eng	us(colemak)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+english-m	us	en-US	!defined(USE_VIRTUAL_KEYBOARD)
 # U.S. English entiries have to be above the Dutch entry so that xkb:us:intl:eng
 # will be selected as the default keyboard when the UI language is set to Dutch.
 
 # Dutch
-xkb:be::nld	be	nld	!defined(TOUCH_UI)
+xkb:be::nld	be	nld	!defined(USE_VIRTUAL_KEYBOARD)
 # We don't support xkb:nl::nld. See b/4430951.
 
 # French
 xkb:fr::fra	fr	fra
-xkb:be::fra	be	fra	!defined(TOUCH_UI)
-xkb:ca::fra	ca	fra	!defined(TOUCH_UI)
-xkb:ch:fr:fra	ch(fr)	fra	!defined(TOUCH_UI)
+xkb:be::fra	be	fra	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ca::fra	ca	fra	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ch:fr:fra	ch(fr)	fra	!defined(USE_VIRTUAL_KEYBOARD)
 
 # German
-xkb:de::ger	de	ger	!defined(TOUCH_UI)
-xkb:de:neo:ger	de(neo)	ger	!defined(TOUCH_UI)
-xkb:be::ger	be	ger	!defined(TOUCH_UI)
-xkb:ch::ger	ch	ger	!defined(TOUCH_UI)
+xkb:de::ger	de	ger	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:de:neo:ger	de(neo)	ger	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:be::ger	be	ger	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ch::ger	ch	ger	!defined(USE_VIRTUAL_KEYBOARD)
 
 # Japanese
 mozc	us	ja
-mozc-jp	jp	ja	!defined(TOUCH_UI)
-mozc-dv	us(dvorak)	ja	!defined(TOUCH_UI)
-xkb:jp::jpn	jp	jpn	!defined(TOUCH_UI)
-zinnia-japanese	handwriting-vk,jp	ja	defined(TOUCH_UI)
+mozc-jp	jp	ja	!defined(USE_VIRTUAL_KEYBOARD)
+mozc-dv	us(dvorak)	ja	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:jp::jpn	jp	jpn	!defined(USE_VIRTUAL_KEYBOARD)
+zinnia-japanese	handwriting-vk,jp	ja	defined(USE_VIRTUAL_KEYBOARD)
 
 # Russian
-xkb:ru::rus	ru	rus	!defined(TOUCH_UI)
-xkb:ru:phonetic:rus	ru(phonetic)	rus	!defined(TOUCH_UI)
+xkb:ru::rus	ru	rus	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ru:phonetic:rus	ru(phonetic)	rus	!defined(USE_VIRTUAL_KEYBOARD)
 
 # Thai
 m17n:th:kesmanee	us	th
@@ -89,7 +89,7 @@ m17n:th:tis820	us	th
 
 # Simplified Chinese
 pinyin	us	zh-CN
-pinyin-dv	us(dvorak)	zh-CN	!defined(TOUCH_UI)
+pinyin-dv	us(dvorak)	zh-CN	!defined(USE_VIRTUAL_KEYBOARD)
 # TODO(yusukes): Define zh_CN_dvorak if it's *really* necessary.
 
 # Traditional Chinese
@@ -167,36 +167,36 @@ m17n:kn:itrans	us	kn
 m17n:am:sera	us	am
 
 # ibux-xkb-layouts input methods (keyboard layouts).
-xkb:br::por	br	por	!defined(TOUCH_UI)
-xkb:bg::bul	bg	bul	!defined(TOUCH_UI)
-xkb:bg:phonetic:bul	bg(phonetic)	bul	!defined(TOUCH_UI)
-xkb:ca:eng:eng	ca(eng)	eng	!defined(TOUCH_UI)
-xkb:cz::cze	cz	cze	!defined(TOUCH_UI)
-xkb:ee::est	ee	est	!defined(TOUCH_UI)
-xkb:es::spa	es	spa	!defined(TOUCH_UI)
-xkb:es:cat:cat	es(cat)	cat	!defined(TOUCH_UI)
-xkb:dk::dan	dk	dan	!defined(TOUCH_UI)
-xkb:gr::gre	gr	gre	!defined(TOUCH_UI)
-xkb:il::heb	il	heb	!defined(TOUCH_UI)
-xkb:latam::spa	latam	spa	!defined(TOUCH_UI)
-xkb:lt::lit	lt	lit	!defined(TOUCH_UI)
-xkb:lv:apostrophe:lav	lv(apostrophe)	lav	!defined(TOUCH_UI)
-xkb:hr::scr	hr	scr	!defined(TOUCH_UI)
-xkb:gb:extd:eng	gb(extd)	eng	!defined(TOUCH_UI)
-xkb:gb:dvorak:eng	gb(dvorak)	eng	!defined(TOUCH_UI)
-xkb:fi::fin	fi	fin	!defined(TOUCH_UI)
-xkb:hu::hun	hu	hun	!defined(TOUCH_UI)
-xkb:it::ita	it	ita	!defined(TOUCH_UI)
-xkb:no::nob	no	nob	!defined(TOUCH_UI)
-xkb:pl::pol	pl	pol	!defined(TOUCH_UI)
-xkb:pt::por	pt	por	!defined(TOUCH_UI)
-xkb:ro::rum	ro	rum	!defined(TOUCH_UI)
-xkb:se::swe	se	swe	!defined(TOUCH_UI)
-xkb:sk::slo	sk	slo	!defined(TOUCH_UI)
-xkb:si::slv	si	slv	!defined(TOUCH_UI)
-xkb:rs::srp	rs	srp	!defined(TOUCH_UI)
-xkb:tr::tur	tr	tur	!defined(TOUCH_UI)
-xkb:ua::ukr	ua	ukr	!defined(TOUCH_UI)
+xkb:br::por	br	por	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:bg::bul	bg	bul	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:bg:phonetic:bul	bg(phonetic)	bul	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ca:eng:eng	ca(eng)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:cz::cze	cz	cze	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ee::est	ee	est	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:es::spa	es	spa	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:es:cat:cat	es(cat)	cat	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:dk::dan	dk	dan	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:gr::gre	gr	gre	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:il::heb	il	heb	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:latam::spa	latam	spa	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:lt::lit	lt	lit	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:lv:apostrophe:lav	lv(apostrophe)	lav	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:hr::scr	hr	scr	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:gb:extd:eng	gb(extd)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:gb:dvorak:eng	gb(dvorak)	eng	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:fi::fin	fi	fin	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:hu::hun	hu	hun	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:it::ita	it	ita	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:no::nob	no	nob	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:pl::pol	pl	pol	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:pt::por	pt	por	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ro::rum	ro	rum	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:se::swe	se	swe	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:sk::slo	sk	slo	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:si::slv	si	slv	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:rs::srp	rs	srp	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:tr::tur	tr	tur	!defined(USE_VIRTUAL_KEYBOARD)
+xkb:ua::ukr	ua	ukr	!defined(USE_VIRTUAL_KEYBOARD)
 
 # TODO(yusukes): Support xkb:latam:deadtilde:spa and/or xkb:latam:nodeadkeys:spa
 # if necessary.
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index dac7b72..9bab73f 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -13,9 +13,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(TOUCH_UI)
-// Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests
-// for now.
+#if defined(USE_VIRTUAL_KEYBOARD)
+// Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
+// skip the tests for now.
 #define TestGetFirstLoginInputMethodIds_Dvorak_And_Ja \
   DISABLED_TestGetFirstLoginInputMethodIds_Dvorak_And_Ja
 #define TestGetFirstLoginInputMethodIds_JP_And_Ja \
@@ -27,7 +27,7 @@
 #define TestGetKeyboardLayoutName DISABLED_TestGetKeyboardLayoutName
 #define TestGetLanguageCodesFromInputMethodIds \
   DISABLED_TestGetLanguageCodesFromInputMethodIds
-#endif  // TOUCH_UI
+#endif  // USE_VIRTUAL_KEYBOARD
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc
index c69c211..2f1d3db 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard.cc
@@ -127,16 +127,17 @@ XKeyboard::XKeyboard(const InputMethodUtil& util)
   std::string layout;
   for (size_t i = 0; i < arraysize(kKeepRightAltInputMethods); ++i) {
     layout = util.GetKeyboardLayoutName(kKeepRightAltInputMethods[i]);
-    // The empty check is necessary since TOUCH_UI build does not support some
-    // of the kKeepRightAltInputMethods elements. For example, when TOUCH_UI is
-    // defined, util.GetKeyboardLayoutName("xkb:us:intl:eng") would return "".
+    // The empty check is necessary since USE_VIRTUAL_KEYBOARD build does not
+    // support some of the kKeepRightAltInputMethods elements. For example,
+    // when USE_VIRTUAL_KEYBOARD is defined,
+    // util.GetKeyboardLayoutName("xkb:us:intl:eng") would return "".
     if (!layout.empty()) {
       keep_right_alt_xkb_layout_names_.insert(layout);
     }
   }
   for (size_t i = 0; i < arraysize(kCapsLockRemapped); ++i) {
     layout = util.GetKeyboardLayoutName(kCapsLockRemapped[i]);
-    // The empty check is for TOUCH_UI build. See above.
+    // The empty check is for USE_VIRTUAL_KEYBOARD build. See above.
     if (!layout.empty()) {
       caps_lock_remapped_xkb_layout_names_.insert(layout);
     }
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
index c9d87d3..8f72a8f 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
@@ -20,14 +20,14 @@
 
 using content::BrowserThread;
 
-#if defined(TOUCH_UI)
-// Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests
-// for now.
+#if defined(USE_VIRTUAL_KEYBOARD)
+// Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
+// skip the tests for now.
 #define TestCreateFullXkbLayoutNameKeepAlt \
   DISABLED_TestCreateFullXkbLayoutNameKeepAlt
 #define TestCreateFullXkbLayoutNameKeepCapsLock \
   DISABLED_TestCreateFullXkbLayoutNameKeepCapsLock
-#endif  // TOUCH_UI
+#endif  // USE_VIRTUAL_KEYBOARD
 
 namespace chromeos {
 namespace input_method {