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 639d88f519772355f67f7c1f18e930d43d2ec90e..d1e3eff43c63d5e21e91e28c8ccc59388d14d613 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -112,7 +112,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
 
@@ -508,7 +508,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
 
@@ -1011,7 +1011,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 =

[Aaron Boodman, 2011/12/02 20:13:58]

Move this closer to where it is used, to reduce the number of ifdefs and make it
easier to read.

       chromeos::input_method::InputMethodManager::GetInstance();
 #endif
@@ -1023,7 +1023,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 =

[Aaron Boodman, 2011/12/02 20:13:58]

What is is_system supposed to mean? There might be a better way to determine it,
for example location() == COMPONENT.