Move functions out of TOUCH_UI defines.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d51c3f68e6509d5611fbd39c77de49b4aff7ec7b..82dd2f77cc5b16509c345481a403f75cd2111a6a 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -110,7 +110,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
 
@@ -500,7 +500,7 @@ void ExtensionService::InitEventRouters() {
   ExtensionInputImeEventRouter::GetInstance()->Init();
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)

[Peng, 2011/11/24 17:11:14]

Without it, the extension can not receive any ime related events (like
updateLookupTable, updatePreeditText and etc), and then apis in inputui are not
useful anymore. So I suggest disable apis in inputui if virtual_keyboard is not
used.

   ExtensionInputUiEventRouter::GetInstance()->Init();
 #endif
 
@@ -1003,7 +1003,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
@@ -1015,7 +1015,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 =