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 f1102d9f6c50f93b2fc255c098330842d0a19874..994d8bbbc9e31f99f5d8f36e29a29814165be639 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
@@ -309,6 +309,7 @@ bool InputMethodManagerImpl::ChangeInputMethodInternal( |
return false; |
} |
+ pending_input_method_.clear(); |
IBusInputContextClient* input_context = |
chromeos::DBusThreadManager::Get()->GetIBusInputContextClient(); |
const std::string current_input_method_id = current_input_method_.id(); |
@@ -401,10 +402,8 @@ void InputMethodManagerImpl::OnComponentExtensionInitialized( |
LoadNecessaryComponentExtensions(); |
- if (!pending_input_method_.empty()) { |
- if (ChangeInputMethodInternal(pending_input_method_, false)) |
- pending_input_method_.clear(); |
- } |
+ if (!pending_input_method_.empty()) |
+ ChangeInputMethodInternal(pending_input_method_, false); |
} |
@@ -722,10 +721,8 @@ void InputMethodManagerImpl::OnConnected() { |
} |
} |
- if (!pending_input_method_.empty()) { |
- if (ChangeInputMethodInternal(pending_input_method_, false)) |
- pending_input_method_.clear(); |
- } |
+ if (!pending_input_method_.empty()) |
+ ChangeInputMethodInternal(pending_input_method_, false); |
} |
void InputMethodManagerImpl::OnDisconnected() { |