Fix InputMethod Widget activation checks; cleanup, etc.

ui/views/ime/input_method_win.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_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "ui/base/events/event.h"
@@ skipping 11 matching lines @@
 namespace views {
 
 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate,
                                HWND hwnd,
                                ui::InputMethod* host)
     : hwnd_(hwnd),
       active_(false),
       direction_(base::i18n::UNKNOWN_DIRECTION),
       pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION),
       host_(host) {
-  set_delegate(delegate);
+  SetDelegate(delegate);
 }
 
 InputMethodWin::~InputMethodWin() {
   if (widget())
     ime_input_.DisableIME(hwnd_);
 }
 
 void InputMethodWin::Init(Widget* widget) {
+  InputMethodBase::Init(widget);
+
   // Gets the initial input locale and text direction information.
   OnInputLangChange(0, 0);
-
-  InputMethodBase::Init(widget);
 }
 
 void InputMethodWin::OnFocus() {
-  DCHECK(!widget_focused());
-  InputMethodBase::OnFocus();
   UpdateIMEState();
 }
 
 void InputMethodWin::OnBlur() {
-  DCHECK(widget_focused());
   ConfirmCompositionText();
-  InputMethodBase::OnBlur();
 }
 
 void InputMethodWin::DispatchKeyEvent(const ui::KeyEvent& key) {
   // Handles ctrl-shift key to change text direction and layout alignment.
   if (ui::ImeInput::IsRTLKeyboardLayoutInstalled() && !IsTextInputTypeNone()) {
     ui::KeyboardCode code = key.key_code();
     if (key.type() == ui::ET_KEY_PRESSED) {
       if (code == ui::VKEY_SHIFT) {
         base::i18n::TextDirection dir;
         if (ui::ImeInput::IsCtrlShiftPressed(&dir))
@@ skipping 370 matching lines @@
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       ime_input_.DisableIME(hwnd_);
       break;
     default:
       ime_input_.EnableIME(hwnd_);
       break;
   }
 }
 
 }  // namespace views