Index: chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
index 3f12f08f982dfcff6b3d816e9b82ff77e6b14909..ee614c18e3aa165ba41160b305ae38c0b65f1536 100644 |
--- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
+++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
@@ -6,6 +6,7 @@ |
#include "ash/display/display_info.h" |
#include "ash/display/display_manager.h" |
+#include "ash/host/ash_remote_window_tree_host_win.h" |
#include "ash/shell.h" |
#include "ash/wm/window_positioner.h" |
#include "base/logging.h" |
@@ -117,8 +118,10 @@ void ChromeMetroViewerProcessHost::OnChannelConnected(int32 /*peer_pid*/) { |
void ChromeMetroViewerProcessHost::OnSetTargetSurface( |
gfx::NativeViewId target_surface) { |
HWND hwnd = reinterpret_cast<HWND>(target_surface); |
+ |
// Make hwnd available as early as possible for proper InputMethod |
// initialization. |
+ ash::AshRemoteWindowTreeHostWin::Init(); |
aura::RemoteWindowTreeHostWin::Instance()->SetRemoteWindowHandle(hwnd); |
// Now start the Ash shell environment. |