Simplify InputMethodWin initialization.

ui/base/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/base/ime/input_method_win.h"
 
 #include "base/basictypes.h"
 #include "base/profiler/scoped_tracker.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/win/tsf_input_scope.h"
@@ skipping 11 matching lines @@
 // is returned to IME for improving conversion accuracy.
 static const size_t kExtraNumberOfChars = 20;
 
 }  // namespace
 
 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate,
                                HWND toplevel_window_handle)
     : toplevel_window_handle_(toplevel_window_handle),
       pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION),
       accept_carriage_return_(false),
-      active_(false),
       enabled_(false),
       is_candidate_popup_open_(false),
       composing_window_handle_(NULL),
-      default_input_language_initialized_(false),
       suppress_next_char_(false) {
   SetDelegate(delegate);
+  OnInputLocaleChanged();
 }
 
 void InputMethodWin::OnFocus() {
   InputMethodBase::OnFocus();
   if (GetTextInputClient())
     UpdateIMEState();
 }
 
 void InputMethodWin::OnBlur() {
   ConfirmCompositionText();
   // Gets the focused text input client before calling parent's OnBlur() because
   // it will cause GetTextInputClient() returns NULL.
   ui::TextInputClient* client = GetTextInputClient();
   InputMethodBase::OnBlur();
   if (client)
     UpdateIMEState();
 }
 
 bool InputMethodWin::OnUntranslatedIMEMessage(
     const base::NativeEvent& event,
     InputMethod::NativeEventResult* result) {
   LRESULT original_result = 0;
   BOOL handled = FALSE;
 
-  if (!default_input_language_initialized_) {
-    // Gets the initial input locale.
-    OnInputLocaleChanged();
-  }
-
   switch (event.message) {
     case WM_IME_SETCONTEXT:
       original_result = OnImeSetContext(
           event.hwnd, event.message, event.wParam, event.lParam, &handled);
       break;
     case WM_IME_STARTCOMPOSITION:
       original_result = OnImeStartComposition(
           event.hwnd, event.message, event.wParam, event.lParam, &handled);
       break;
     case WM_IME_COMPOSITION:
@@ skipping 94 matching lines @@
                        screen_bounds.size());
   imm32_manager_.UpdateCaretRect(attached_window, caret_rect);
 }
 
 void InputMethodWin::CancelComposition(const TextInputClient* client) {
   if (enabled_ && IsTextInputClientFocused(client))
     imm32_manager_.CancelIME(toplevel_window_handle_);
 }
 
 void InputMethodWin::OnInputLocaleChanged() {
-  default_input_language_initialized_ = true;
-  active_ = imm32_manager_.SetInputLanguage();
   locale_ = imm32_manager_.GetInputLanguageName();
   OnInputMethodChanged();
 }
 
 std::string InputMethodWin::GetInputLocale() {
   return locale_;
 }
 
-bool InputMethodWin::IsActive() {
-  return active_;
-}
-
 bool InputMethodWin::IsCandidatePopupOpen() const {
   return is_candidate_popup_open_;
 }
 
 void InputMethodWin::OnWillChangeFocusedClient(TextInputClient* focused_before,
                                                TextInputClient* focused) {
   if (IsWindowFocused(focused_before))
     ConfirmCompositionText();
 }
 
@@ skipping 422 matching lines @@
       enabled_ = true;
       break;
   }
 
   imm32_manager_.SetTextInputMode(window_handle, text_input_mode);
   tsf_inputscope::SetInputScopeForTsfUnawareWindow(
       window_handle, text_input_type, text_input_mode);
 }
 
 }  // namespace ui