diff options
| author | yukawa@chromium.org <yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 08:16:59 +0000 |
|---|---|---|
| committer | yukawa@chromium.org <yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 08:16:59 +0000 |
| commit | b76ee6f64a25f1a20994fac0e653ac42f8e42ac0 (patch) | |
| tree | 8f43091d5abdb4ec14501582dcf42bc055d46ae8 | |
| parent | 83286fa8ff7176396b147c813b1adc9fcb74a441 (diff) | |
| download | chromium_src-b76ee6f64a25f1a20994fac0e653ac42f8e42ac0.zip chromium_src-b76ee6f64a25f1a20994fac0e653ac42f8e42ac0.tar.gz chromium_src-b76ee6f64a25f1a20994fac0e653ac42f8e42ac0.tar.bz2 | |
Add InputScope support into InputMethodIMM32
RWHVW has directly used InputScope APIs that are available
for IMM32 applications.
In order to migrate from RWHVW to RWHVA as Aura transition,
InputMethodIMM32 should also have InputScope support since
RWHVA delegates all the IME activities into InputMethodIMM32.
BUG=296505, 244688
TEST=manually done with Aura build on Windows 8.1
Review URL: https://chromiumcodereview.appspot.com/23537064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224954 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/base/ime/input_method_imm32.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/base/ime/input_method_imm32.cc b/ui/base/ime/input_method_imm32.cc index 41f65df..4f17ea9 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 |