Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2057)

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: modified per comments. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..8a802c762682d547143c82bbcb86b17e4bb8c2ab 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,12 @@ void ComponentLoader::AddDefaultComponentExtensions(
void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
bool skip_session_components) {
+#if defined(OS_CHROMEOS)
+ chromeos::input_method::InputMethodManager* input_method_manager =
+ chromeos::input_method::InputMethodManager::Get();
+ if (input_method_manager)
+ input_method_manager->InitializeComponentExtension();
+#endif
// No component extension for kiosk app launch splash screen.
if (skip_session_components)
return;

Powered by Google App Engine
This is Rietveld 408576698