Moving input_ime to api/ .

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 9a13fddc15158e7b23019347f2aeef15e3074a59..40cce004ccca926ca06e8dfb114006be64e477b1 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -46,7 +46,6 @@
 #include "chrome/browser/extensions/extension_font_settings_api.h"
 #include "chrome/browser/extensions/extension_global_error.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_input_ime_api.h"

[vabr (Chromium), 2012/07/12 17:37:56]

This was duplicate of the line 123. I guess the one which is ifdef-ed for
OS_CHROMEOS is right.

 #include "chrome/browser/extensions/extension_managed_mode_api.h"
 #include "chrome/browser/extensions/extension_management_api.h"
 #include "chrome/browser/extensions/extension_preference_api.h"
@@ -120,7 +119,7 @@
 #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 "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #endif
@@ -509,7 +508,7 @@ void ExtensionService::InitEventRouters() {
       new chromeos::ExtensionInputMethodEventRouter);
 
   ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
-  ExtensionInputImeEventRouter::GetInstance()->Init();
+  extensions::ExtensionInputImeEventRouter::GetInstance()->Init();
 #endif
 #endif  // defined(ENABLE_EXTENSIONS)
   event_routers_initialized_ = true;
@@ -1036,7 +1035,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
        component != extension->input_components().end();
        ++component) {
     if (component->type == Extension::INPUT_COMPONENT_TYPE_IME) {
-      ExtensionInputImeEventRouter::GetInstance()->RegisterIme(
+      extensions::ExtensionInputImeEventRouter::GetInstance()->RegisterIme(
           profile_, extension->id(), *component);
     }
   }
@@ -1078,7 +1077,7 @@ void ExtensionService::NotifyExtensionUnloaded(
   }
 
   if (extension->input_components().size() > 0) {
-    ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes(
+    extensions::ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes(
         profile_, extension->id());
   }
 #endif