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

Unified Diff: mojo/edk/system/node_controller.h

Issue 2738853002: Connections now take a ConnectionParams instead of a pipe handle. (Closed)
Patch Set: Fix Win compile 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
Index: mojo/edk/system/node_controller.h
diff --git a/mojo/edk/system/node_controller.h b/mojo/edk/system/node_controller.h
index 9458a082683df86e39eb4d7bd842caaa40bb029f..ab5331c13d6583761fbedaaa4d74ecbcde6815f9 100644
--- a/mojo/edk/system/node_controller.h
+++ b/mojo/edk/system/node_controller.h
@@ -73,7 +73,7 @@ class NodeController : public ports::NodeDelegate,
// Connects this node to a child node. This node will initiate a handshake.
void ConnectToChild(base::ProcessHandle process_handle,
- ScopedPlatformHandle platform_handle,
+ ConnectionParam connection_param,
const std::string& child_token,
const ProcessErrorCallback& process_error_callback);
@@ -86,11 +86,11 @@ class NodeController : public ports::NodeDelegate,
// Connects this node to a parent node. The parent node will initiate a
// handshake.
- void ConnectToParent(ScopedPlatformHandle platform_handle);
+ void ConnectToParent(ConnectionParam connection_param);
// Connects this node to a peer node. On success, |port| will be merged with
// the corresponding port in the peer node.
- void ConnectToPeer(ScopedPlatformHandle handle,
+ void ConnectToPeer(ConnectionParam connection_param,
const ports::PortRef& port,
const std::string& peer_token);
@@ -168,12 +168,12 @@ class NodeController : public ports::NodeDelegate,
void ConnectToChildOnIOThread(
base::ProcessHandle process_handle,
- ScopedPlatformHandle platform_handle,
+ ConnectionParam connection_param,
ports::NodeName token,
const ProcessErrorCallback& process_error_callback);
- void ConnectToParentOnIOThread(ScopedPlatformHandle platform_handle);
+ void ConnectToParentOnIOThread(ConnectionParam connection_param);
- void ConnectToPeerOnIOThread(ScopedPlatformHandle handle,
+ void ConnectToPeerOnIOThread(ConnectionParam connection_param,
ports::NodeName token,
ports::PortRef port,
const std::string& peer_token);

Powered by Google App Engine
This is Rietveld 408576698