Support inputmode attribute for Windows Aura.

ui/base/ime/input_method_imm32.cc

 // Copyright (c) 2013 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_imm32.h"
 
 #include "base/basictypes.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/base/ime/win/tsf_input_scope.h"

[Yohei Yukawa, 2013/09/02 04:20:07]

Do we really need this header?

[yoichio, 2013/09/02 04:56:59]

Thanks.

 
 
 namespace ui {
 
 InputMethodIMM32::InputMethodIMM32(internal::InputMethodDelegate* delegate,
                                    HWND toplevel_window_handle)
     : InputMethodWin(delegate, toplevel_window_handle),
       enabled_(false), is_candidate_popup_open_(false),
       composing_window_handle_(NULL) {
   // In non-Aura environment, appropriate callbacks to OnFocus() and OnBlur()
@@ skipping 243 matching lines @@
     // a result text to us, in case the input method and the client are in
     // inconsistent states, we check the client's composition state again.
     if (GetTextInputClient()->HasCompositionText())
       GetTextInputClient()->ConfirmCompositionText();
   }
 }
 
 void InputMethodIMM32::UpdateIMEState() {
   // Use switch here in case we are going to add more text input types.
   // We disable input method in password field.
+  const HWND window_handle = GetAttachedWindowHandle(GetTextInputClient());
   switch (GetTextInputType()) {
     case ui::TEXT_INPUT_TYPE_NONE:
     case ui::TEXT_INPUT_TYPE_PASSWORD:
-      imm32_manager_.DisableIME(GetAttachedWindowHandle(GetTextInputClient()));
+      imm32_manager_.DisableIME(window_handle);
       enabled_ = false;
       break;
     default:
-      imm32_manager_.EnableIME(GetAttachedWindowHandle(GetTextInputClient()));
+      imm32_manager_.EnableIME(window_handle);
       enabled_ = true;
       break;
   }
+
+  imm32_manager_.SetTextInputMode(window_handle, GetTextInputMode());
 }
 
 bool InputMethodIMM32::IsWindowFocused(const TextInputClient* client) const {
   if (!client)
     return false;
   HWND attached_window_handle = GetAttachedWindowHandle(client);
   return attached_window_handle && GetFocus() == attached_window_handle;
 }
 
 }  // namespace ui