From 7031350ad817767a05fb5482eb98ea2cd913f354 Mon Sep 17 00:00:00 2001 From: "shuchen@chromium.org" Date: Fri, 11 Jul 2014 04:46:38 +0000 Subject: [PATCH] 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 --- chrome/browser/chromeos/input_method/input_method_manager_impl.cc | 6 ++++++ 1 file changed, 6 insertions(+) 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 33951f236c13..b89db86fbb9b 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -22,6 +22,7 @@ #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/language_preferences.h" +#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" #include "chromeos/ime/component_extension_ime_manager.h" @@ -486,6 +487,11 @@ void InputMethodManagerImpl::AddInputMethodExtension( profile_engine_map_[GetProfile()][id] = engine; + if (id == current_input_method_.id()) { + IMEBridge::Get()->SetCurrentEngineHandler(engine); + engine->Enable(); + } + if (extension_ime_util::IsComponentExtensionIME(id)) return; -- 2.11.4.GIT