diff options
| author | ben <ben@chromium.org> | 2016-03-07 21:17:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 05:19:18 +0000 |
| commit | 9a8e15f6e8b9de90a8dff395a68ea6212226786f (patch) | |
| tree | 0d52507eae83c18306610a7c59a28888f172ef39 /ash | |
| parent | 8321be3ffa0a72ce42efea09c0a8ef303be66e20 (diff) | |
| download | chromium_src-9a8e15f6e8b9de90a8dff395a68ea6212226786f.zip chromium_src-9a8e15f6e8b9de90a8dff395a68ea6212226786f.tar.gz chromium_src-9a8e15f6e8b9de90a8dff395a68ea6212226786f.tar.bz2 | |
Add a instance groups to Connect(), and introduce an Identity struct.
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1769163002
Cr-Commit-Position: refs/heads/master@{#379757}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/mus/sysui_application.cc | 3 | ||||
| -rw-r--r-- | ash/mus/sysui_application.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc index 9154947..16585a3 100644 --- a/ash/mus/sysui_application.cc +++ b/ash/mus/sysui_application.cc @@ -278,8 +278,7 @@ SysUIApplication::SysUIApplication() {} SysUIApplication::~SysUIApplication() {} void SysUIApplication::Initialize(mojo::Connector* connector, - const std::string& url, - const std::string& user_id, + const mojo::Identity& identity, 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 78d1599..dba0f5e 100644 --- a/ash/mus/sysui_application.h +++ b/ash/mus/sysui_application.h @@ -23,8 +23,7 @@ class SysUIApplication : public mojo::ShellClient { private: // mojo::ShellClient: void Initialize(mojo::Connector* connector, - const std::string& url, - const std::string& user_id, + const mojo::Identity& identity, uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; |