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/shell.h | |
| 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/shell.h')
| -rw-r--r-- | mojo/shell/shell.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/shell/shell.h b/mojo/shell/shell.h index 7767198..4a5dcb2 100644 --- a/mojo/shell/shell.h +++ b/mojo/shell/shell.h @@ -122,11 +122,11 @@ class Shell : public ShellClient { mojom::ShellClientRequest* request); // Called from the instance implementing mojom::Shell. |user_id| must be - // resolved by the instance (i.e. must not be mojom::Connector::kUserInherit). + // resolved by the instance (i.e. must not be mojom::kInheritUserID). void CreateInstanceForFactory( mojom::ShellClientFactoryPtr factory, - const String& name, - uint32_t user_id, + const std::string& name, + const std::string& user_id, mojom::CapabilityFilterPtr filter, mojom::PIDReceiverRequest pid_receiver); // Called from the instance implementing mojom::Shell. |