Pull InputIme stuff out of ExtensionService

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2012 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 <iterator>
 #include <set>
 
@@ skipping 97 matching lines @@
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/extensions/file_browser_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/api/input_ime/input_ime_api.h"
 #include "content/public/browser/storage_partition.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::PluginService;
@@ skipping 394 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
   browser_event_router_.reset(new extensions::BrowserEventRouter(profile_));
 
   extensions::PushMessagingAPIFactory::GetForProfile(profile_);
 
 #if defined(OS_CHROMEOS)
   FileBrowserEventRouterFactory::GetForProfile(
       profile_)->ObserveFileSystemEvents();
 
   ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
-  extensions::InputImeEventRouter::GetInstance()->Init();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(ENABLE_EXTENSIONS)
   event_routers_initialized_ = true;
 }
 
 void ExtensionService::Shutdown() {
   // Do nothing for now.
 }
 
 const Extension* ExtensionService::GetExtensionById(
@@ skipping 586 matching lines @@
     const Extension::NaClModuleInfo& module = extension->nacl_modules()[i];
     RegisterNaClModule(module.url, module.mime_type);
     nacl_modules_changed = true;
   }
 
   if (nacl_modules_changed)
     UpdatePluginListWithNaClModules();
 
   if (plugins_changed || nacl_modules_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
-
-#if defined(OS_CHROMEOS)
-  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) {
-      extensions::InputImeEventRouter::GetInstance()->RegisterIme(
-          profile_, extension->id(), *component);
-    }
-  }
-#endif
 }
 
 void ExtensionService::NotifyExtensionUnloaded(
     const Extension* extension,
     extension_misc::UnloadedExtensionReason reason) {
   UnloadedExtensionInfo details(extension, reason);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(profile_),
       content::Details<UnloadedExtensionInfo>(&details));
@@ skipping 27 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // Revoke external file access to third party extensions.
   fileapi::FileSystemContext* filesystem_context =
       BrowserContext::GetDefaultStoragePartition(profile_)->
           GetFileSystemContext();
   if (filesystem_context && filesystem_context->external_provider()) {
     filesystem_context->external_provider()->
         RevokeAccessForExtension(extension->id());
   }
-
-  if (extension->input_components().size() > 0) {
-    extensions::InputImeEventRouter::GetInstance()->UnregisterAllImes(
-        profile_, extension->id());
-  }
 #endif
 
   UpdateActiveExtensionsInCrashReporter();
 
   bool plugins_changed = false;
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
     PluginService::GetInstance()->ForcePluginShutdown(plugin.path);
     PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->RemoveExtraPluginPath(plugin.path);
@@ skipping 1934 matching lines @@
     scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
     DCHECK(extension);
     if (!extension)
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
   }
 
   IdentifyAlertableExtensions();
 }