The metro_driver should not block the UI thread while waiting for the Chrome browser IPC channel to…

win8/metro_driver/chrome_app_view_ash.h

Index: win8/metro_driver/chrome_app_view_ash.h
diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h
index ca0dad50ab7035589f2031d7a73972a1ee2b7e5a..866c3f46989c728ddbf41ea13403d711ad6e219f 100644
--- a/win8/metro_driver/chrome_app_view_ash.h
+++ b/win8/metro_driver/chrome_app_view_ash.h
@@ -13,6 +13,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
+#include "base/threading/thread.h"
+#include "ipc/ipc_listener.h"
 #include "ui/events/event_constants.h"
 #include "win8/metro_driver/direct3d_helper.h"
 #include "win8/metro_driver/ime/ime_popup_observer.h"
@@ -196,6 +198,13 @@ class ChromeAppViewAsh
   HRESULT OnSizeChanged(winui::Core::ICoreWindow* sender,
                         winui::Core::IWindowSizeChangedEventArgs* args);
 
+  // This function waits for the Chrome browser channel to be initialized.
+  // It then goes ahead and starts up the viewer in Chrome OS mode.
+  static void CALLBACK StartChromeOSMode(HWND core_window,
+                                         UINT message,
+                                         UINT_PTR timer_id,
+                                         DWORD time);
+
   mswr::ComPtr<winui::Core::ICoreWindow> window_;
   mswr::ComPtr<winapp::Core::ICoreApplicationView> view_;
   EventRegistrationToken activated_token_;
@@ -220,8 +229,11 @@ class ChromeAppViewAsh
   // Set the D3D swap chain and nothing else.
   metro_driver::Direct3DHelper direct3d_helper_;
 
+  // The IPC channel IO thread.
+  scoped_ptr<base::Thread> io_thread_;
+
   // The channel to Chrome, in particular to the MetroViewerProcessHost.
-  IPC::ChannelProxy* ui_channel_;
+  scoped_ptr<IPC::ChannelProxy> ui_channel_;
 
   // The actual window behind the view surface.
   HWND core_window_hwnd_;
@@ -241,6 +253,14 @@ class ChromeAppViewAsh
 
   // The cursor set by the chroem browser process.
   HCURSOR last_cursor_;
+
+  // The pointer to the ChromeAppViewAsh instance. There should only be one
+  // instance of the ChromeAppViewAsh class.
+  static ChromeAppViewAsh* g_instance_;
+
+  // Pointer to the channel listener for the channel between the viewer and
+  // the browser.
+  IPC::Listener* channel_listener_;
 };
 
 #endif  // WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_