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 /ipc/ipc_channel_proxy.h | |
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 'ipc/ipc_channel_proxy.h')
-rw-r--r-- | ipc/ipc_channel_proxy.h | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h index d1f270d..0a3a5d2 100644 --- a/ipc/ipc_channel_proxy.h +++ b/ipc/ipc_channel_proxy.h @@ -64,31 +64,10 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe { // on the background thread. Any message not handled by the filter will be // dispatched to the listener. The given task runner correspond to a thread // on which IPC::Channel is created and used (e.g. IO thread). - // The naming pattern follows IPC::Channel. The Create() does not create - // underlying channel and let Init*() do it. - static scoped_ptr<ChannelProxy> Create( - Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); - - static scoped_ptr<ChannelProxy> CreateClient( - const IPC::ChannelHandle& channel_handle, - Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); - - static scoped_ptr<ChannelProxy> CreateServer( - const IPC::ChannelHandle& channel_handle, - Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); - - static scoped_ptr<ChannelProxy> CreateNamedClient( - const IPC::ChannelHandle& channel_handle, - Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); - - static scoped_ptr<ChannelProxy> CreateNamedServer( - const IPC::ChannelHandle& channel_handle, - Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); + ChannelProxy(const IPC::ChannelHandle& channel_handle, + Channel::Mode mode, + Listener* listener, + base::SingleThreadTaskRunner* ipc_task_runner); virtual ~ChannelProxy(); @@ -96,17 +75,8 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe { // proxy that was not initialized in its constructor. If create_pipe_now is // true, the pipe is created synchronously. Otherwise it's created on the IO // thread. - // The naming pattern follows IPC::Channel::Create*(). - void InitByMode(const IPC::ChannelHandle& channel_handle, Channel::Mode mode, - bool create_pipe_now); - void InitClient(const IPC::ChannelHandle& channel_handle, - bool create_pipe_now); - void InitServer(const IPC::ChannelHandle& channel_handle, - bool create_pipe_now); - void InitNamedClient(const IPC::ChannelHandle& channel_handle, - bool create_pipe_now); - void InitNamedServer(const IPC::ChannelHandle& channel_handle, - bool create_pipe_now); + void Init(const IPC::ChannelHandle& channel_handle, Channel::Mode mode, + bool create_pipe_now); // Close the IPC::Channel. This operation completes asynchronously, once the // background thread processes the command to close the channel. It is ok to @@ -154,10 +124,6 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe { // to the internal state. ChannelProxy(Context* context); - ChannelProxy(Listener* listener, - base::SingleThreadTaskRunner* ipc_task_runner); - - // Used internally to hold state that is referenced on the IPC thread. class Context : public base::RefCountedThreadSafe<Context>, public Listener { |