diff options
| author | ananta <ananta@chromium.org> | 2014-10-10 18:55:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-11 01:55:44 +0000 |
| commit | 2b628ae2ef33a0ffaa89e7522125b807186b3c69 (patch) | |
| tree | 191061a4d1bcb0ddf1255ba123783a22fd21947e | |
| parent | 7832a4ee148a97057188ecb7165f9252185644f0 (diff) | |
| download | chromium_src-2b628ae2ef33a0ffaa89e7522125b807186b3c69.zip chromium_src-2b628ae2ef33a0ffaa89e7522125b807186b3c69.tar.gz chromium_src-2b628ae2ef33a0ffaa89e7522125b807186b3c69.tar.bz2 | |
Ensure that the TextServices object which implements IME for Windows 7/8 ASH gets window activation notifications on Windows 7.
This ensures that the IME composition window shows up in the correct place while typing.
BUG=421980
Review URL: https://codereview.chromium.org/646123002
Cr-Commit-Position: refs/heads/master@{#299229}
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 0560e73..d0530bd 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -1303,14 +1303,14 @@ HRESULT ChromeAppViewAsh::OnWindowActivated( // the same. if (state == winui::Core::CoreWindowActivationState_CodeActivated || state == winui::Core::CoreWindowActivationState_PointerActivated) { - if (text_service_) - text_service_->OnWindowActivated(); ui_channel_->Send(new MetroViewerHostMsg_WindowActivated(false)); } } else { // On Windows 7, we force a repaint when the window is activated. ui_channel_->Send(new MetroViewerHostMsg_WindowActivated(true)); } + if (text_service_) + text_service_->OnWindowActivated(); return S_OK; } |