Moving IME manifests to chrome resources.

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 20d08009a2e3cbf2ce88a64753f6a7e87242f462..70cc7ce6dcc6047fcd2ad51417bbd9f4d911f73c 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -41,6 +41,7 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/ime/input_method_manager.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ -425,6 +426,11 @@ void ComponentLoader::AddDefaultComponentExtensions(
   // Do not add component extensions that have background pages here -- add them
   // to AddDefaultComponentExtensionsWithBackgroundPages.
 #if defined(OS_CHROMEOS)
+  chromeos::input_method::InputMethodManager* input_method_manager =
+      chromeos::input_method::InputMethodManager::Get();
+  if (input_method_manager)
+    input_method_manager->InitializeComponentExtension();
+
   Add(IDR_MOBILE_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
 
@@ -466,6 +472,11 @@ void ComponentLoader::AddDefaultComponentExtensions(
 
 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
     bool skip_session_components) {
+  chromeos::input_method::InputMethodManager* input_method_manager =

[Nico, 2014/07/22 17:05:08]

Does this need an #if defined(OS_CHROMEOS) block?

[Shu Chen, 2014/07/23 00:56:45]

AddDefaultComponentExtensionsForKioskMode is called only when #if
defined(OS_CHROMEOS).

But to make it safer, I've added the #if defined(OS_CHROMEOS) block. Thanks

[Nico, 2014/07/23 01:03:10]

Oh ok, if this is only called on cros either, then as it was before is fine too.
Up to you.

[Nico, 2014/07/23 01:03:10]

Oh ok, if this is only called on cros either, then as it was before is fine too.
Up to you.

+      chromeos::input_method::InputMethodManager::Get();
+  if (input_method_manager)
+    input_method_manager->InitializeComponentExtension();
+
   // No component extension for kiosk app launch splash screen.
   if (skip_session_components)
     return;