diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 20:29:30 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 20:29:30 +0000 |
| commit | 3b0e466e530c99fe730a9a5e11dd416c48e052f8 (patch) | |
| tree | d4f4d955edc7076fa3408c6625174179da5df72f /win8 | |
| parent | d53b6850a51ebedb7496036ae31e5f2dd142efff (diff) | |
| download | chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.zip chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.gz chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.bz2 | |
Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."
Broke Windows compile:
http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder&number=180
FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\remoting\host\win\remoting_core.wts_session_process_delegate.obj.rsp /c ..\..\remoting\host\win\wts_session_process_delegate.cc /Foobj\remoting\host\win\remoting_core.wts_session_process_delegate.obj /Fdobj\remoting\remoting_core.cc.pdb
c:\b\build\slave\win_x64_builder\build\src\remoting\host\win\wts_session_process_delegate.cc(386) : error C2661: 'IPC::ChannelProxy::ChannelProxy' : no overloaded function takes 4 arguments
ninja: build stopped: subcommand failed.
> Introduce IPC::ChannelProxy::Create*() and IPC::SynChannel::Create*()
>
> This change hides constructors of these classes so that we can turn
> them polymorphic classes.
>
> Note that having almost identical ChannelProxy::Init*() isn't great
> and they will be replaced by a factory-like abstraction in coming
> changes.
>
> TEST=none
> R=darin,cpu
> BUG=377980
>
> Review URL: https://codereview.chromium.org/301973003
TBR=morrita@chromium.org
Review URL: https://codereview.chromium.org/312553004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 10 | ||||
| -rw-r--r-- | win8/viewer/metro_viewer_process_host.cc | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 2ade77a..c104a15 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -694,11 +694,11 @@ ChromeAppViewAsh::Run() { // In Aura mode we create an IPC channel to the browser, then ask it to // connect to us. ChromeChannelListener ui_channel_listener(&ui_loop_, this); - scoped_ptr<IPC::ChannelProxy> channel = IPC::ChannelProxy::CreateNamedClient( - win8::kMetroViewerIPCChannelName, - &ui_channel_listener, - io_thread.message_loop_proxy()); - ui_channel_ = channel.get(); + IPC::ChannelProxy ui_channel(win8::kMetroViewerIPCChannelName, + IPC::Channel::MODE_NAMED_CLIENT, + &ui_channel_listener, + io_thread.message_loop_proxy()); + ui_channel_ = &ui_channel; // Upon receipt of the MetroViewerHostMsg_SetTargetSurface message the // browser will use D3D from the browser process to present to our Window. diff --git a/win8/viewer/metro_viewer_process_host.cc b/win8/viewer/metro_viewer_process_host.cc index eaeaedf..70b6b35 100644 --- a/win8/viewer/metro_viewer_process_host.cc +++ b/win8/viewer/metro_viewer_process_host.cc @@ -51,10 +51,11 @@ MetroViewerProcessHost::MetroViewerProcessHost( DCHECK(!instance_); instance_ = this; - channel_ = IPC::ChannelProxy::CreateNamedServer( + channel_.reset(new IPC::ChannelProxy( kMetroViewerIPCChannelName, + IPC::Channel::MODE_NAMED_SERVER, this, - ipc_task_runner); + ipc_task_runner)); } MetroViewerProcessHost::~MetroViewerProcessHost() { |