Commit 7031350a authored by shuchen@chromium.org's avatar shuchen@chromium.org

Makes sure InputMethodEngine::Enable() can be called after chrome starts.

BUG=391674
TEST=Verified on pixel device.

Review URL: https://codereview.chromium.org/375363002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282543 0039d316-1c4b-4281-b951-d872f2087c98
parent 1f724521
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h" #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
#include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h"
#include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chromeos/ime/component_extension_ime_manager.h" #include "chromeos/ime/component_extension_ime_manager.h"
...@@ -486,6 +487,11 @@ void InputMethodManagerImpl::AddInputMethodExtension( ...@@ -486,6 +487,11 @@ void InputMethodManagerImpl::AddInputMethodExtension(
profile_engine_map_[GetProfile()][id] = engine; profile_engine_map_[GetProfile()][id] = engine;
if (id == current_input_method_.id()) {
IMEBridge::Get()->SetCurrentEngineHandler(engine);
engine->Enable();
}
if (extension_ime_util::IsComponentExtensionIME(id)) if (extension_ime_util::IsComponentExtensionIME(id))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment