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 41f65dfb37dba4d40698cd3aad4da08ff5f17f6b..4f17ea9a19bcaf0512925686c5acd292f3ff8531 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" |
namespace ui { |
@@ -265,7 +266,9 @@ 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()) { |
+ const TextInputType text_input_type = GetTextInputType(); |
+ const TextInputMode text_input_mode = GetTextInputMode(); |
+ switch (text_input_type) { |
case ui::TEXT_INPUT_TYPE_NONE: |
case ui::TEXT_INPUT_TYPE_PASSWORD: |
imm32_manager_.DisableIME(window_handle); |
@@ -277,7 +280,9 @@ void InputMethodIMM32::UpdateIMEState() { |
break; |
} |
- imm32_manager_.SetTextInputMode(window_handle, GetTextInputMode()); |
+ imm32_manager_.SetTextInputMode(window_handle, text_input_mode); |
+ tsf_inputscope::SetInputScopeForTsfUnawareWindow( |
+ window_handle, text_input_type, text_input_mode); |
} |
} // namespace ui |