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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 462383003: Remove the check for loading component IME extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. 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/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index f72ec7d78f4d36b573fd8d8f9c5662cbb5496853..7e52336621dc05fd9c077f03d3de70f6a925c214 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -57,11 +57,12 @@ bool InputMethodManagerImpl::MigrateInputMethods(
}
InputMethodManagerImpl::InputMethodManagerImpl(
- scoped_ptr<InputMethodDelegate> delegate)
+ scoped_ptr<InputMethodDelegate> delegate, bool enable_extension_loading)
: delegate_(delegate.Pass()),
state_(STATE_LOGIN_SCREEN),
util_(delegate_.get()),
- component_extension_ime_manager_(new ComponentExtensionIMEManager()) {
+ component_extension_ime_manager_(new ComponentExtensionIMEManager()),
+ enable_extension_loading_(enable_extension_loading) {
if (base::SysInfo::IsRunningOnChromeOS())
keyboard_.reset(ImeKeyboard::Create());
else
@@ -419,8 +420,9 @@ void InputMethodManagerImpl::LoadNecessaryComponentExtensions() {
active_input_method_ids_.push_back(unfiltered_input_method_ids[i]);
} else if (component_extension_ime_manager_->IsWhitelisted(
unfiltered_input_method_ids[i])) {
- component_extension_ime_manager_->LoadComponentExtensionIME(
- unfiltered_input_method_ids[i]);
+ if (enable_extension_loading_)
+ component_extension_ime_manager_->LoadComponentExtensionIME(
+ unfiltered_input_method_ids[i]);
active_input_method_ids_.push_back(unfiltered_input_method_ids[i]);
}
}

Powered by Google App Engine
This is Rietveld 408576698