diff options
Diffstat (limited to 'ipc/ipc_channel_win.cc')
| -rw-r--r-- | ipc/ipc_channel_win.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 31d1d185..28a880d 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -97,8 +97,8 @@ Channel::ChannelImpl::State::~State() { //------------------------------------------------------------------------------ -Channel::ChannelImpl::ChannelImpl(const std::string& channel_id, Mode mode, - Listener* listener) +Channel::ChannelImpl::ChannelImpl(const IPC::ChannelHandle &channel_handle, + Mode mode, Listener* listener) : ALLOW_THIS_IN_INITIALIZER_LIST(input_state_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(output_state_(this)), pipe_(INVALID_HANDLE_VALUE), @@ -106,9 +106,9 @@ Channel::ChannelImpl::ChannelImpl(const std::string& channel_id, Mode mode, waiting_connect_(mode == MODE_SERVER), processing_incoming_(false), ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) { - if (!CreatePipe(channel_id, mode)) { + if (!CreatePipe(channel_handle, mode)) { // The pipe may have been closed already. - LOG(WARNING) << "Unable to create pipe named \"" << channel_id << + LOG(WARNING) << "Unable to create pipe named \"" << channel_handle.name << "\" in " << (mode == 0 ? "server" : "client") << " mode."; } } @@ -175,10 +175,10 @@ const std::wstring Channel::ChannelImpl::PipeName( return ss.str(); } -bool Channel::ChannelImpl::CreatePipe(const std::string& channel_id, +bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle &channel_handle, Mode mode) { DCHECK(pipe_ == INVALID_HANDLE_VALUE); - const std::wstring pipe_name = PipeName(channel_id); + const std::wstring pipe_name = PipeName(channel_handle.name); if (mode == MODE_SERVER) { SECURITY_ATTRIBUTES security_attributes = {0}; security_attributes.bInheritHandle = FALSE; @@ -469,9 +469,9 @@ void Channel::ChannelImpl::OnIOCompleted(MessageLoopForIO::IOContext* context, //------------------------------------------------------------------------------ // Channel's methods simply call through to ChannelImpl. -Channel::Channel(const std::string& channel_id, Mode mode, +Channel::Channel(const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener) - : channel_impl_(new ChannelImpl(channel_id, mode, listener)) { + : channel_impl_(new ChannelImpl(channel_handle, mode, listener)) { } Channel::~Channel() { |