Moving IME manifests to chrome resources.

chrome/browser/extensions/component_loader.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/component_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 23 matching lines @@
 #endif
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/defaults.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #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"
 #include "webkit/browser/fileapi/file_system_context.h"
 #endif
 
 #if defined(ENABLE_APP_LIST)
 #include "grit/chromium_strings.h"
 #endif
 
@@ skipping 364 matching lines @@
 // static
 void ComponentLoader::EnableBackgroundExtensionsForTesting() {
   enable_background_extensions_during_testing = true;
 }
 
 void ComponentLoader::AddDefaultComponentExtensions(
     bool skip_session_components) {
   // 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")));
 
 #if defined(GOOGLE_CHROME_BUILD)
   if (browser_defaults::enable_help_app) {
     Add(IDR_HELP_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
                                "/usr/share/chromeos-assets/helpapp")));
   }
 #endif
 
@@ skipping 21 matching lines @@
     AddChromeApp();
   }
 
   AddKeyboardApp();
 
   AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
 }
 
 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;
 
   // Component extensions needed for kiosk apps.
   AddVideoPlayerExtension();
   AddFileManagerExtension();
   AddGalleryExtension();
 
   // Add virtual keyboard.
@@ skipping 167 matching lines @@
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     fileapi::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
 }  // namespace extensions