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

Unified Diff: ui/views/ime/input_method_bridge.cc

Issue 12902029: Fix InputMethod Widget activation checks; cleanup, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 9 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 | « ui/views/ime/input_method_base.cc ('k') | ui/views/ime/input_method_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/ime/input_method_bridge.cc
diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc
index c672cc069381b49b05a98e83992a1c2458d491e8..a09df108b9f30c63a0721bd16f4305dacb9bc048 100644
--- a/ui/views/ime/input_method_bridge.cc
+++ b/ui/views/ime/input_method_bridge.cc
@@ -19,7 +19,7 @@ InputMethodBridge::InputMethodBridge(internal::InputMethodDelegate* delegate,
shared_input_method_(shared_input_method),
context_focused_(false) {
DCHECK(host_);
- set_delegate(delegate);
+ SetDelegate(delegate);
}
InputMethodBridge::~InputMethodBridge() {
@@ -32,10 +32,7 @@ void InputMethodBridge::Init(Widget* widget) {
}
void InputMethodBridge::OnFocus() {
- InputMethodBase::OnFocus();
-
- // Ask the system-wide IME to send all TextInputClient messages to |this|
- // object.
+ // Direct the shared IME to send TextInputClient messages to |this| object.
if (shared_input_method_ || !host_->GetTextInputClient())
host_->SetFocusedTextInputClient(this);
@@ -46,12 +43,7 @@ void InputMethodBridge::OnFocus() {
}
void InputMethodBridge::OnBlur() {
- // win32 sends multiple focus lost events, ignore all but the first.
- if (widget_focused())
- return;
-
ConfirmCompositionText();
- InputMethodBase::OnBlur();
if (host_->GetTextInputClient() == this)
host_->SetFocusedTextInputClient(NULL);
}
« no previous file with comments | « ui/views/ime/input_method_base.cc ('k') | ui/views/ime/input_method_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698