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

Unified Diff: mojo/shell/standalone/context.cc

Issue 1719193003: Add a user id parameter to connections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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/shell/runner/child/native_apptest_target.cc ('k') | mojo/shell/tests/application_manager_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/standalone/context.cc
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc
index 2c49e73f591756513d378fbf76619e0201096917..a966020c6897fd3a9c4cb2668a0ac3bad030d2da 100644
--- a/mojo/shell/standalone/context.cc
+++ b/mojo/shell/standalone/context.cc
@@ -155,9 +155,9 @@ void Context::Init(const base::FilePath& shell_file_root) {
new TracingInterfaceProvider(&tracer_, GetProxy(&tracing_local_interfaces));
scoped_ptr<ConnectParams> params(new ConnectParams);
- params->set_source(Identity(GURL("mojo:shell"), std::string(),
- GetPermissiveCapabilityFilter()));
+ params->set_source(CreateShellIdentity());
params->set_target(Identity(GURL("mojo:tracing"), std::string(),
+ mojom::Shell::kUserInherit,
GetPermissiveCapabilityFilter()));
params->set_remote_interfaces(GetProxy(&tracing_remote_interfaces));
params->set_local_interfaces(std::move(tracing_local_interfaces));
@@ -227,8 +227,10 @@ void Context::Run(const GURL& url) {
shell::mojom::InterfaceProviderPtr local_interfaces;
scoped_ptr<ConnectParams> params(new ConnectParams);
+ params->set_source(CreateShellIdentity());
params->set_target(
- Identity(url, std::string(), GetPermissiveCapabilityFilter()));
+ Identity(url, std::string(), mojom::Shell::kUserRoot,
+ GetPermissiveCapabilityFilter()));
params->set_remote_interfaces(GetProxy(&remote_interfaces));
params->set_local_interfaces(std::move(local_interfaces));
application_manager_->Connect(std::move(params));
« no previous file with comments | « mojo/shell/runner/child/native_apptest_target.cc ('k') | mojo/shell/tests/application_manager_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698