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

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

Issue 348293002: Do not consume Alt-Shift-Up event for IME switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
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 318621a977a503dcfd140c195f14856c8256c880..dde139b3143284eb43a1a17b5fb7214dc0f658f9 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -643,27 +643,27 @@ void InputMethodManagerImpl::SetInputMethodLoginDefault() {
}
}
-bool InputMethodManagerImpl::SwitchToNextInputMethod() {
+void InputMethodManagerImpl::SwitchToNextInputMethod() {
// Sanity checks.
if (active_input_method_ids_.empty()) {
DVLOG(1) << "active input method is empty";
- return false;
+ return;
}
if (current_input_method_.id().empty()) {
DVLOG(1) << "current_input_method_ is unknown";
- return false;
+ return;
}
// Do not consume key event if there is only one input method is enabled.
// Ctrl+Space or Alt+Shift may be used by other application.
if (active_input_method_ids_.size() == 1)
- return false;
+ return;
// Find the next input method and switch to it.
SwitchToNextInputMethodInternal(active_input_method_ids_,
current_input_method_.id());
- return true;
+ return;
Shu Chen 2014/06/24 00:48:49 This return is unnecessary.
Seigo Nonaka 2014/06/24 04:35:01 Done.
}
bool InputMethodManagerImpl::SwitchToPreviousInputMethod(
@@ -684,7 +684,8 @@ bool InputMethodManagerImpl::SwitchToPreviousInputMethod(
if (previous_input_method_.id().empty() ||
previous_input_method_.id() == current_input_method_.id()) {
- return SwitchToNextInputMethod();
+ SwitchToNextInputMethod();
+ return true;
}
std::vector<std::string>::const_iterator iter =
@@ -693,7 +694,8 @@ bool InputMethodManagerImpl::SwitchToPreviousInputMethod(
previous_input_method_.id());
if (iter == active_input_method_ids_.end()) {
// previous_input_method_ is not supported.
- return SwitchToNextInputMethod();
+ SwitchToNextInputMethod();
+ return true;
}
ChangeInputMethodInternal(*iter, true);
return true;

Powered by Google App Engine
This is Rietveld 408576698