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 /mash/example | |
| 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 'mash/example')
4 files changed, 10 insertions, 11 deletions
diff --git a/mash/example/views_examples/views_examples_application_delegate.cc b/mash/example/views_examples/views_examples_application_delegate.cc index b3b87e9..8bc5678 100644 --- a/mash/example/views_examples/views_examples_application_delegate.cc +++ b/mash/example/views_examples/views_examples_application_delegate.cc @@ -16,11 +16,11 @@ ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate() {} ViewsExamplesApplicationDelegate::~ViewsExamplesApplicationDelegate() { } -void ViewsExamplesApplicationDelegate::Initialize(mojo::Connector* connector, - const std::string& url, - const std::string& user_id, - uint32_t id) { - tracing_.Initialize(connector, url); +void ViewsExamplesApplicationDelegate::Initialize( + mojo::Connector* connector, + const mojo::Identity& identity, + uint32_t id) { + tracing_.Initialize(connector, identity.name()); aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); views::WindowManagerConnection::Create(connector); diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/mash/example/views_examples/views_examples_application_delegate.h index cb1ab50..3b4fb11 100644 --- a/mash/example/views_examples/views_examples_application_delegate.h +++ b/mash/example/views_examples/views_examples_application_delegate.h @@ -21,8 +21,8 @@ class ViewsExamplesApplicationDelegate : public mojo::ShellClient { private: // mojo::ShellClient: - void Initialize(mojo::Connector* connector, const std::string& url, - const std::string& user_id, uint32_t id) override; + void Initialize(mojo::Connector* connector, const mojo::Identity& identity, + uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; mojo::TracingImpl tracing_; diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc index 141bb3f..106dfc1 100644 --- a/mash/example/window_type_launcher/window_type_launcher.cc +++ b/mash/example/window_type_launcher/window_type_launcher.cc @@ -356,8 +356,7 @@ WindowTypeLauncher::WindowTypeLauncher() {} WindowTypeLauncher::~WindowTypeLauncher() {} void WindowTypeLauncher::Initialize(mojo::Connector* connector, - const std::string& url, - const std::string& user_id, + const mojo::Identity& identity, uint32_t id) { aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h index c5bad8a..dbbf40f 100644 --- a/mash/example/window_type_launcher/window_type_launcher.h +++ b/mash/example/window_type_launcher/window_type_launcher.h @@ -20,8 +20,8 @@ class WindowTypeLauncher : public mojo::ShellClient { private: // mojo::ShellClient: - void Initialize(mojo::Connector* connector, const std::string& url, - const std::string& user_id, uint32_t id) override; + void Initialize(mojo::Connector* connector, const mojo::Identity& identity, + uint32_t id) override; scoped_ptr<views::AuraInit> aura_init_; |