Move functions out of TOUCH_UI defines.

BUG=105046
TEST=manually


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

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

chrome/browser/extensions/extension_function_dispatcher.cc

@@ -74,7 +74,7 @@
 #include "chrome/browser/extensions/extension_input_api.h"
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/extensions/extension_input_ui_api.h"
 #endif
 
@@ -328,7 +328,7 @@ void FactoryRegistry::ResetFunctions() {
   RegisterFunction<UpdateMenuItemsFunction>();
 
   RegisterFunction<InputEventHandled>();
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   RegisterFunction<CandidateClickedInputUiFunction>();
   RegisterFunction<CursorUpInputUiFunction>();
   RegisterFunction<CursorDownInputUiFunction>();
@@ -411,7 +411,7 @@ void FactoryRegistry::ResetFunctions() {
   // InputMethod
   RegisterFunction<GetInputMethodFunction>();
 
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   // Input
   RegisterFunction<SendHandwritingStrokeFunction>();
   RegisterFunction<CancelHandwritingStrokesFunction>();

chrome/browser/extensions/extension_input_api.cc

@@ -23,7 +23,7 @@
 #include "content/public/browser/notification_service.h"
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
@@ -74,7 +74,7 @@ uint16 UnicodeIdentifierStringToInt(const std::string& key_identifier) {
 }
 
 views::Widget* GetTopLevelWidget(Browser* browser) {
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
   chromeos::LoginDisplayHost* host =
       chromeos::BaseLoginDisplayHost::default_host();
   if (host)
@@ -187,7 +187,7 @@ bool SetKeyboardHeightFunction::RunImpl() {
 }
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 // TODO(yusukes): This part should be moved to extension_input_api_chromeos.cc.
 bool SendHandwritingStrokeFunction::RunImpl() {
   // TODO(yusukes): Add a parameter for an input context ID.

chrome/browser/extensions/extension_input_api.h

@@ -37,10 +37,10 @@ class SetKeyboardHeightFunction : public AsyncExtensionFunction {
 };
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
-// Note that this experimental APIs are currently only available for
-// TOUCH_UI version of Chrome OS. Please also note that the version of Chrome
-// OS is always built with TOOLKIT_VIEWS.
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
+// Note that these experimental APIs are currently only available for
+// versions of Chrome OS built with USE_VIRTUAL_KEYBOARD. Please also note that
+// the version of Chrome OS is always built with TOOLKIT_VIEWS.
 //
 // We may eventually support other platforms, especially non TOUCH_UI version
 // of Chrome OS.

chrome/browser/extensions/extension_service.cc

@@ -113,7 +113,7 @@
 #include "webkit/fileapi/file_system_path_manager.h"
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/extensions/extension_input_ui_api.h"
 #endif
 
@@ -511,7 +511,7 @@ void ExtensionService::InitEventRouters() {
   ExtensionInputImeEventRouter::GetInstance()->Init();
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
   ExtensionInputUiEventRouter::GetInstance()->Init();
 #endif
 
@@ -1013,7 +1013,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 
 #if defined(OS_CHROMEOS)
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   chromeos::input_method::InputMethodManager* input_method_manager =
       chromeos::input_method::InputMethodManager::GetInstance();
 #endif
@@ -1025,7 +1025,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
       ExtensionInputImeEventRouter::GetInstance()->RegisterIme(
           profile_, extension->id(), *component);
     }
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
     if (component->type == Extension::INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD &&
         !component->layouts.empty()) {
       const bool is_system =