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 32504e4612e0b47d5e32cb729c8b1841ea7992a6..65de63831918e24c010f0d17ee5ef9a485f3aa03 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
@@ -445,7 +445,7 @@ void InputMethodManagerImpl::StateImpl::AddInputMethodExtension( |
DCHECK(engine); |
- manager_->engine_map_[extension_id] = engine; |
+ manager_->engine_map_[profile][extension_id] = engine; |
bool contain = false; |
for (size_t i = 0; i < descriptors.size(); i++) { |
@@ -502,10 +502,10 @@ void InputMethodManagerImpl::StateImpl::RemoveInputMethodExtension( |
if (IsActive()) { |
if (IMEBridge::Get()->GetCurrentEngineHandler() == |
- manager_->engine_map_[extension_id]) { |
+ manager_->engine_map_[profile][extension_id]) { |
IMEBridge::Get()->SetCurrentEngineHandler(NULL); |
} |
- manager_->engine_map_.erase(extension_id); |
+ manager_->engine_map_[profile].erase(extension_id); |
} |
// If |current_input_method| is no longer in |active_input_method_ids|, |
@@ -1009,7 +1009,7 @@ void InputMethodManagerImpl::ChangeInputMethodInternal( |
extension_ime_util::GetExtensionIDFromInputMethodID(descriptor.id()); |
const std::string& component_id = |
extension_ime_util::GetComponentIDByInputMethodID(descriptor.id()); |
- engine = engine_map_[extension_id]; |
+ engine = engine_map_[ProfileManager::GetActiveUserProfile()][extension_id]; |
Shu Chen
2015/05/08 07:56:48
After cl https://codereview.chromium.org/105586300
|
IMEBridge::Get()->SetCurrentEngineHandler(engine); |