Chromium Code Reviews| 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..d8ba89b030efb8144aff17266087d8de5853c3da 100644 |
| --- a/win8/metro_driver/chrome_app_view_ash.h |
| +++ b/win8/metro_driver/chrome_app_view_ash.h |
| @@ -13,6 +13,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/message_loop/message_loop.h" |
| #include "base/strings/string16.h" |
| +#include "base/threading/thread.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 +197,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_; |
| @@ -221,7 +229,7 @@ class ChromeAppViewAsh |
| metro_driver::Direct3DHelper direct3d_helper_; |
| // 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 +249,9 @@ class ChromeAppViewAsh |
| // The cursor set by the chroem browser process. |
| HCURSOR last_cursor_; |
| + |
| + // The IPC channel IO thread. |
| + scoped_ptr<base::Thread> io_thread_; |
|
scottmg
2014/09/24 02:40:32
maybe move this above the ui_channel_ since it's s
ananta
2014/09/24 18:22:33
Done.
|
| }; |
| #endif // WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_ |