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

Unified Diff: content/browser/mojo/mojo_application_host.cc

Issue 2019973002: [mojo-edk] Bind a child token to child launches and port reservations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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 | « content/browser/mojo/mojo_application_host.h ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_application_host.cc
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
index f2b110e71b197d24f4c04d417489b3619ff26a96..2a7062618d8aa29c4a91d47d3ce642b67764e22e 100644
--- a/content/browser/mojo/mojo_application_host.cc
+++ b/content/browser/mojo/mojo_application_host.cc
@@ -38,7 +38,7 @@ class ApplicationSetupImpl : public mojom::ApplicationSetup {
} // namespace
-MojoApplicationHost::MojoApplicationHost()
+MojoApplicationHost::MojoApplicationHost(const std::string& child_token)
: token_(mojo::edk::GenerateRandomToken()) {
#if defined(OS_ANDROID)
service_registry_android_ =
@@ -46,7 +46,7 @@ MojoApplicationHost::MojoApplicationHost()
#endif
mojo::ScopedMessagePipeHandle pipe =
- mojo::edk::CreateParentMessagePipe(token_);
+ mojo::edk::CreateParentMessagePipe(token_, child_token);
DCHECK(pipe.is_valid());
application_setup_.reset(new ApplicationSetupImpl(
&service_registry_,
« no previous file with comments | « content/browser/mojo/mojo_application_host.h ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698