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

Unified Diff: ui/base/ime/input_method_tsf.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: rebase 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_linux_x11.cc ('k') | ui/base/ime/remote_input_method_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_tsf.cc
diff --git a/ui/base/ime/input_method_tsf.cc b/ui/base/ime/input_method_tsf.cc
index 845172dd09a710aaa763d44afae57910bee0f8b1..5e6de052e55a0f9e38fbbd772e253e3b3aee0139 100644
--- a/ui/base/ime/input_method_tsf.cc
+++ b/ui/base/ime/input_method_tsf.cc
@@ -98,17 +98,16 @@ bool InputMethodTSF::OnUntranslatedIMEMessage(
}
void InputMethodTSF::OnTextInputTypeChanged(const TextInputClient* client) {
- if (IsTextInputClientFocused(client) && IsWindowFocused(client)) {
- ui::TSFBridge::GetInstance()->CancelComposition();
- ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
- }
- InputMethodWin::OnTextInputTypeChanged(client);
+ if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
+ return;
+ ui::TSFBridge::GetInstance()->CancelComposition();
+ ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
}
void InputMethodTSF::OnCaretBoundsChanged(const TextInputClient* client) {
- if (IsTextInputClientFocused(client) && IsWindowFocused(client))
- ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
- InputMethodWin::OnCaretBoundsChanged(client);
+ if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
+ return;
+ ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
}
void InputMethodTSF::CancelComposition(const TextInputClient* client) {
« no previous file with comments | « ui/base/ime/input_method_linux_x11.cc ('k') | ui/base/ime/remote_input_method_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698