diff options
author | ben <ben@chromium.org> | 2016-03-05 08:54:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-05 16:55:47 +0000 |
commit | cccfe2ac0e74379a36ce020db5c08c3ccffdd362 (patch) | |
tree | 7b743925a0ab636ed21980067ac53fdefd7bd1ab /mojo/shell/standalone | |
parent | 9b87f72d46de40949404f9754db8eab87000d645 (diff) | |
download | chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.zip chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.tar.gz chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.tar.bz2 |
Change userid from a uint32_t to a string guid
TBR=sky@chromium.org
BUG=
patch from issue 1760963003 at patchset 20001 (http://crrev.com/1760963003#ps20001)
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1770533002
Cr-Commit-Position: refs/heads/master@{#379476}
Diffstat (limited to 'mojo/shell/standalone')
-rw-r--r-- | mojo/shell/standalone/context.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index bc4d52e..6cd1ac4 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -164,8 +164,8 @@ void Context::Init(scoped_ptr<InitParams> init_params) { scoped_ptr<ConnectParams> params(new ConnectParams); params->set_source(CreateShellIdentity()); - params->set_target(Identity("mojo:tracing", std::string(), - mojom::Connector::kUserInherit)); + params->set_target( + Identity("mojo:tracing", std::string(), mojom::kInheritUserID)); params->set_remote_interfaces(GetProxy(&tracing_remote_interfaces)); params->set_local_interfaces(std::move(tracing_local_interfaces)); shell_->Connect(std::move(params)); @@ -238,8 +238,7 @@ void Context::Run(const std::string& name) { scoped_ptr<ConnectParams> params(new ConnectParams); params->set_source(CreateShellIdentity()); - params->set_target(Identity(name, std::string(), - mojom::Connector::kUserRoot)); + params->set_target(Identity(name, std::string(), mojom::kRootUserID)); params->set_remote_interfaces(GetProxy(&remote_interfaces)); params->set_local_interfaces(std::move(local_interfaces)); shell_->Connect(std::move(params)); |