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)); |