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

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

Issue 467073002: Only initialize the input method list for once, no need to re-initialize for each profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 c29cad3e217462270cb6e85c6157372ccbf74e9b..ec60802104249ce97a4f7f81436f4119d4924d87 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -42,7 +42,6 @@
#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"
@@ -427,11 +426,6 @@ 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")));
@@ -473,12 +467,6 @@ 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;
« no previous file with comments | « chrome/browser/chromeos/input_method/mock_input_method_manager.cc ('k') | chromeos/ime/input_method_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698