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

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

Issue 15954008: Reset pending input method id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698