diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 03:41:59 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 03:41:59 +0000 |
| commit | 75427788cced8c598b33aa9ecdb206b48cb9d89d (patch) | |
| tree | 5ebfb5b3fe982b235a39b05f3445338fad187210 /ash | |
| parent | 3f8340c8669b1884bdd7c2b07611e0fad6c7f3e6 (diff) | |
| download | chromium_src-75427788cced8c598b33aa9ecdb206b48cb9d89d.zip chromium_src-75427788cced8c598b33aa9ecdb206b48cb9d89d.tar.gz chromium_src-75427788cced8c598b33aa9ecdb206b48cb9d89d.tar.bz2 | |
Set the remote window HWND handle to RemoteWindowTreeHostWin as
early as possible so that other parts can depend on it during early initialization.
Since r242975 which changed the initialization order, IME has been
regressed on Metro mode and IME wasn't available in Metro/Ash
mode (Desktop is Okay).
This was because IsRemoteInputMethodRequired() function
relies on the root window HWND which was unavailable
due to the initialization order change, and wrongly
IMM32 InputMethod was instantiated.
The cause was originally investigated and fixed by yukawa@.
BUG=334380
TEST=manual (install, run in Metro Ash mode, activate IME)
Review URL: https://codereview.chromium.org/138843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/test/test_metro_viewer_process_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index 9dc3406..5cb348b 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -30,7 +30,8 @@ void TestMetroViewerProcessHost::OnSetTargetSurface( gfx::NativeViewId target_surface) { DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface; HWND hwnd = reinterpret_cast<HWND>(target_surface); - aura::RemoteWindowTreeHostWin::Instance()->Connected(this, hwnd); + aura::RemoteWindowTreeHostWin::Instance()->SetRemoteWindowHandle(hwnd); + aura::RemoteWindowTreeHostWin::Instance()->Connected(this); backing_surface_.reset(new AcceleratedSurface(hwnd)); } |