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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/mus/sysui_application.cc | 4 | ||||
| -rw-r--r-- | ash/mus/sysui_application.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc index c55482a..9154947 100644 --- a/ash/mus/sysui_application.cc +++ b/ash/mus/sysui_application.cc @@ -279,8 +279,8 @@ SysUIApplication::~SysUIApplication() {} void SysUIApplication::Initialize(mojo::Connector* connector, const std::string& url, - uint32_t id, - uint32_t user_id) { + const std::string& user_id, + uint32_t id) { ash_init_.reset(new AshInit()); ash_init_->Initialize(connector); } diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h index c597651..78d1599 100644 --- a/ash/mus/sysui_application.h +++ b/ash/mus/sysui_application.h @@ -24,8 +24,8 @@ class SysUIApplication : public mojo::ShellClient { // mojo::ShellClient: void Initialize(mojo::Connector* connector, const std::string& url, - uint32_t id, - uint32_t user_id) override; + const std::string& user_id, + uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; mojo::TracingImpl tracing_; |