Chromium Code Reviews| Index: ui/base/ime/input_method_imm32.cc |
| diff --git a/ui/base/ime/input_method_imm32.cc b/ui/base/ime/input_method_imm32.cc |
| index 1a3cf266afec3ab10bae0971c08ebdcaa2890aa3..8f5b9a53788b83ee8c2f4106b4f3bbeba2867cbb 100644 |
| --- a/ui/base/ime/input_method_imm32.cc |
| +++ b/ui/base/ime/input_method_imm32.cc |
| @@ -7,6 +7,7 @@ |
| #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 { |
| @@ -270,17 +271,20 @@ void InputMethodIMM32::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 { |