| Index: win8/metro_driver/chrome_app_view_ash.cc
|
| diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
|
| index 8fac81cf26c442b3fa849afb89f32a009d63cdff..5f9eaeef2c5d3d9c7044f76a0e09ec95bb808777 100644
|
| --- a/win8/metro_driver/chrome_app_view_ash.cc
|
| +++ b/win8/metro_driver/chrome_app_view_ash.cc
|
| @@ -19,6 +19,7 @@
|
| #include "base/win/win_util.h"
|
| #include "base/win/windows_version.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "ipc/attachment_broker_win.h"
|
| #include "ipc/ipc_channel.h"
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "ipc/ipc_sender.h"
|
| @@ -658,6 +659,7 @@ ChromeAppViewAsh::Run() {
|
| HRESULT hr = window_->get_Dispatcher(dispatcher.GetAddressOf());
|
| CheckHR(hr, "Dispatcher failed.");
|
|
|
| + attachment_broker_.reset(new IPC::AttachmentBrokerWin);
|
| // Create the IPC channel IO thread. It needs to out-live the ChannelProxy.
|
| io_thread_.reset(new base::Thread("metro_IO_thread"));
|
| base::Thread::Options options;
|
| @@ -1417,11 +1419,10 @@ void ChromeAppViewAsh::StartChromeOSMode() {
|
|
|
| // In Aura mode we create an IPC channel to the browser, then ask it to
|
| // connect to us.
|
| - ui_channel_ =
|
| - IPC::ChannelProxy::Create(win8::kMetroViewerIPCChannelName,
|
| - IPC::Channel::MODE_NAMED_CLIENT,
|
| - channel_listener_,
|
| - io_thread_->message_loop_proxy());
|
| + ui_channel_ = IPC::ChannelProxy::Create(
|
| + win8::kMetroViewerIPCChannelName, IPC::Channel::MODE_NAMED_CLIENT,
|
| + channel_listener_, io_thread_->message_loop_proxy(),
|
| + attachment_broker_.get());
|
| DVLOG(1) << "Created channel proxy";
|
|
|
| // Upon receipt of the MetroViewerHostMsg_SetTargetSurface message the
|
|
|