Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1030)

Unified Diff: mojo/edk/system/node_channel.cc

Issue 2738853002: Connections now take a ConnectionParams instead of a pipe handle. (Closed)
Patch Set: Fix Win release build. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/node_channel.h ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/node_channel.cc
diff --git a/mojo/edk/system/node_channel.cc b/mojo/edk/system/node_channel.cc
index 91a69c3b9db27361c00fba41806f38ab9cac9d5f..b0f770d9076fe0f4111afdee33d0aa2785a66ddc 100644
--- a/mojo/edk/system/node_channel.cc
+++ b/mojo/edk/system/node_channel.cc
@@ -160,14 +160,14 @@ bool GetMessagePayload(const void* bytes,
// static
scoped_refptr<NodeChannel> NodeChannel::Create(
Delegate* delegate,
- ScopedPlatformHandle platform_handle,
+ ConnectionParams connection_params,
scoped_refptr<base::TaskRunner> io_task_runner,
const ProcessErrorCallback& process_error_callback) {
#if defined(OS_NACL_SFI)
LOG(FATAL) << "Multi-process not yet supported on NaCl-SFI";
return nullptr;
#else
- return new NodeChannel(delegate, std::move(platform_handle), io_task_runner,
+ return new NodeChannel(delegate, std::move(connection_params), io_task_runner,
process_error_callback);
#endif
}
@@ -454,17 +454,18 @@ void NodeChannel::PortsMessageFromRelay(const ports::NodeName& source,
#endif // defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
NodeChannel::NodeChannel(Delegate* delegate,
- ScopedPlatformHandle platform_handle,
+ ConnectionParams connection_params,
scoped_refptr<base::TaskRunner> io_task_runner,
const ProcessErrorCallback& process_error_callback)
: delegate_(delegate),
io_task_runner_(io_task_runner),
process_error_callback_(process_error_callback)
#if !defined(OS_NACL_SFI)
- , channel_(
- Channel::Create(this, std::move(platform_handle), io_task_runner_))
+ ,
+ channel_(
+ Channel::Create(this, std::move(connection_params), io_task_runner_))
#endif
- {
+{
}
NodeChannel::~NodeChannel() {
« no previous file with comments | « mojo/edk/system/node_channel.h ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698