| Index: mojo/edk/system/node_controller.h
|
| diff --git a/mojo/edk/system/node_controller.h b/mojo/edk/system/node_controller.h
|
| index 0675e9743f7177bed66740f24dd0404217289cf0..605a12c590fb951a2b4548956b7fe01384516a0b 100644
|
| --- a/mojo/edk/system/node_controller.h
|
| +++ b/mojo/edk/system/node_controller.h
|
| @@ -62,11 +62,13 @@ 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);
|
| + ScopedPlatformHandle platform_handle,
|
| + const std::string& secret);
|
|
|
| // Connects this node to a parent node. The parent node will initiate a
|
| // handshake.
|
| - void ConnectToParent(ScopedPlatformHandle platform_handle);
|
| + void ConnectToParent(ScopedPlatformHandle platform_handle,
|
| + const std::string& secret);
|
|
|
| // Sets a port's observer. If |observer| is null the port's current observer
|
| // is removed.
|
| @@ -110,8 +112,10 @@ class NodeController : public ports::NodeDelegate,
|
| using OutgoingMessageQueue = std::queue<Channel::MessagePtr>;
|
|
|
| void ConnectToChildOnIOThread(base::ProcessHandle process_handle,
|
| - ScopedPlatformHandle platform_handle);
|
| - void ConnectToParentOnIOThread(ScopedPlatformHandle platform_handle);
|
| + ScopedPlatformHandle platform_handle,
|
| + const std::string& secret);
|
| + void ConnectToParentOnIOThread(ScopedPlatformHandle platform_handle,
|
| + const std::string& secret);
|
|
|
| scoped_refptr<NodeChannel> GetPeerChannel(const ports::NodeName& name);
|
| scoped_refptr<NodeChannel> GetParentChannel();
|
|
|