Using input language instead of the application locale to determine the Omnibox's text input type o…

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 <stddef.h>
 #include <stdint.h>
 #include <cwctype>
 
@@ skipping 249 matching lines @@
         text_input_type != TEXT_INPUT_TYPE_PASSWORD && GetEngine()) {
       GetEngine()->Reset();
     }
 
     if (enabled_)
       imm32_manager_.CancelIME(toplevel_window_handle_);
   }
 }
 
 void InputMethodWin::OnInputLocaleChanged() {
-  // Note: OnInputLocaleChanged() is for crbug.com/168971.
+  // Note: OnInputLocaleChanged() is for capturing the input language which can
+  // be used to determine the appropriate TextInputType for Omnibox.
+  // See crbug.com/344834.
+  // Currently OnInputLocaleChanged() on Windows relies on WM_INPUTLANGCHANGED,
+  // which is known to be incompatible with TSF.
+  // TODO(shuchen): Use ITfLanguageProfileNotifySink instead.
   OnInputMethodChanged();
+  imm32_manager_.SetInputLanguage();
 }
 
-std::string InputMethodWin::GetInputLocale() {
-  return imm32_manager_.GetInputLanguageName();
+bool InputMethodWin::IsInputLocaleCJK() const {
+  return imm32_manager_.IsInputLanguageCJK();
 }
 
 bool InputMethodWin::IsCandidatePopupOpen() const {
   return is_candidate_popup_open_;
 }
 
 void InputMethodWin::OnWillChangeFocusedClient(TextInputClient* focused_before,
                                                TextInputClient* focused) {
   if (IsWindowFocused(focused_before))
     ConfirmCompositionText();
@@ skipping 419 matching lines @@
   ui::IMEEngineHandlerInterface* engine = GetEngine();
   if (engine) {
     if (old_text_input_type != ui::TEXT_INPUT_TYPE_NONE)
       engine->FocusOut();
     if (GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
       engine->FocusIn(context);
   }
 }
 
 }  // namespace ui