Fix InputMethod Widget activation checks; cleanup, etc.

ui/views/ime/input_method_bridge.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/ime/input_method_bridge.h"
 
 #include "ui/base/events/event.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 InputMethodBridge::InputMethodBridge(internal::InputMethodDelegate* delegate,
                                      ui::InputMethod* host,
                                      bool shared_input_method)
     : host_(host),
       shared_input_method_(shared_input_method),
       context_focused_(false) {
   DCHECK(host_);
-  set_delegate(delegate);
+  SetDelegate(delegate);
 }
 
 InputMethodBridge::~InputMethodBridge() {
   if (host_->GetTextInputClient() == this)
     host_->SetFocusedTextInputClient(NULL);
 }
 
 void InputMethodBridge::Init(Widget* widget) {
   InputMethodBase::Init(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);
 
   // TODO(yusukes): We don't need to call OnTextInputTypeChanged() once we move
   // text input type tracker code to ui::InputMethodBase.
   if (GetFocusedView())
     OnTextInputTypeChanged(GetFocusedView());
 }
 
 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);
 }
 
 void InputMethodBridge::DispatchKeyEvent(const ui::KeyEvent& key) {
   DCHECK(key.type() == ui::ET_KEY_PRESSED || key.type() == ui::ET_KEY_RELEASED);
 
   // We can just dispatch the event here since the |key| is already processed by
   // the system-wide IME.
   DispatchKeyEventPostIME(key);
@@ skipping 163 matching lines @@
 void InputMethodBridge::OnWillChangeFocus(View* focused_before, View* focused) {
   ConfirmCompositionText();
 }
 
 void InputMethodBridge::OnDidChangeFocus(View* focused_before, View* focused) {
   OnTextInputTypeChanged(GetFocusedView());
   OnCaretBoundsChanged(GetFocusedView());
 }
 
 }  // namespace views