Move functions out of TOUCH_UI defines.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 94 matching lines @@
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/extensions/extension_input_ime_api.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #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
 
 using base::Time;
 using content::BrowserThread;
 
 namespace errors = extension_manifest_errors;
 
 namespace {
 
@@ skipping 375 matching lines @@
       new ExtensionFileBrowserEventRouter(profile_));
   file_browser_event_router_->ObserveFileSystemEvents();
 
   input_method_event_router_.reset(
       new chromeos::ExtensionInputMethodEventRouter);
 
   ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
   ExtensionInputImeEventRouter::GetInstance()->Init();
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
   ExtensionInputUiEventRouter::GetInstance()->Init();
 #endif
 
   event_routers_initialized_ = true;
 }
 
 const Extension* ExtensionService::GetExtensionById(
     const std::string& id, bool include_disabled) const {
   return GetExtensionByIdInternal(id, true, include_disabled, false);
 }
@@ skipping 482 matching lines @@
     nacl_modules_changed = true;
   }
 
   if (nacl_modules_changed)
     UpdatePluginListWithNaClModules();
 
   if (plugins_changed || nacl_modules_changed)
     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
   for (std::vector<Extension::InputComponentInfo>::const_iterator component =
            extension->input_components().begin();
        component != extension->input_components().end();
        ++component) {
     if (component->type == Extension::INPUT_COMPONENT_TYPE_IME) {
       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.

           !Extension::IsExternalLocation(extension->location());
       input_method_manager->RegisterVirtualKeyboard(
           extension->url(),
           component->name,  // human-readable name of the keyboard extension.
           component->layouts,
           is_system);
     }
 #endif
   }
 #endif
@@ skipping 1477 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }