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

Unified Diff: ui/base/ime/input_method_linux_x11.cc

Issue 81023002: Remove dead code unnecessarily added by r231563 and 236449 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | « ui/base/ime/input_method_imm32.cc ('k') | ui/base/ime/input_method_tsf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_linux_x11.cc
diff --git a/ui/base/ime/input_method_linux_x11.cc b/ui/base/ime/input_method_linux_x11.cc
index efbd94011dca2b5e53e2fa358adf2dac7b5af633..0e0f42ff6284920c982f8fbe3202038ea840c405 100644
--- a/ui/base/ime/input_method_linux_x11.cc
+++ b/ui/base/ime/input_method_linux_x11.cc
@@ -108,26 +108,23 @@ bool InputMethodLinuxX11::DispatchKeyEvent(const ui::KeyEvent& event) {
void InputMethodLinuxX11::OnTextInputTypeChanged(
const TextInputClient* client) {
- if (IsTextInputClientFocused(client)) {
- input_method_context_->Reset();
- // TODO(yoichio): Support inputmode HTML attribute.
- input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
- }
- InputMethodBase::OnTextInputTypeChanged(client);
+ if (IsTextInputClientFocused(client))
Yuki 2013/11/25 08:58:49 You must have forgotten to put ! (unary not oeprat
yukawa 2013/11/25 09:03:34 Exactly! Done.
+ return;
+ input_method_context_->Reset();
+ // TODO(yoichio): Support inputmode HTML attribute.
+ input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
}
void InputMethodLinuxX11::OnCaretBoundsChanged(const TextInputClient* client) {
- if (IsTextInputClientFocused(client)) {
- input_method_context_->OnCaretBoundsChanged(
- GetTextInputClient()->GetCaretBounds());
- }
- InputMethodBase::OnCaretBoundsChanged(client);
+ if (IsTextInputClientFocused(client))
Yuki 2013/11/25 08:58:49 You must have forgotten to put ! (unary not oeprat
yukawa 2013/11/25 09:03:34 Done.
+ return;
+ input_method_context_->OnCaretBoundsChanged(
+ GetTextInputClient()->GetCaretBounds());
}
void InputMethodLinuxX11::CancelComposition(const TextInputClient* client) {
if (!IsTextInputClientFocused(client))
return;
-
input_method_context_->Reset();
input_method_context_->OnTextInputTypeChanged(client->GetTextInputType());
}
« no previous file with comments | « ui/base/ime/input_method_imm32.cc ('k') | ui/base/ime/input_method_tsf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698