Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: mash/task_viewer/task_viewer.cc

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/wm/window_manager_application.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/task_viewer/task_viewer.cc
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
index e3af3da154d9962545a152f0b309df08540107d8..4a26c4fa544de363a52d44b2c110a7a15da883bf 100644
--- a/mash/task_viewer/task_viewer.cc
+++ b/mash/task_viewer/task_viewer.cc
@@ -142,8 +142,9 @@ class TaskViewerContents : public views::WidgetDelegateView,
DCHECK(instances_.empty());
mojo::Array<mojo::String> names;
for (size_t i = 0; i < instances.size(); ++i) {
- InsertInstance(instances[i]->id, instances[i]->name, instances[i]->pid);
- names.push_back(instances[i]->name);
+ InsertInstance(instances[i]->id, instances[i]->identity->name,
+ instances[i]->pid);
+ names.push_back(instances[i]->identity->name);
}
catalog_->GetEntries(std::move(names),
base::Bind(&TaskViewerContents::OnGotCatalogEntries,
@@ -151,10 +152,10 @@ class TaskViewerContents : public views::WidgetDelegateView,
}
void InstanceCreated(InstanceInfoPtr instance) override {
DCHECK(!ContainsId(instance->id));
- InsertInstance(instance->id, instance->name, instance->pid);
+ InsertInstance(instance->id, instance->identity->name, instance->pid);
observer_->OnItemsAdded(static_cast<int>(instances_.size()), 1);
mojo::Array<mojo::String> names;
- names.push_back(instance->name);
+ names.push_back(instance->identity->name);
catalog_->GetEntries(std::move(names),
base::Bind(&TaskViewerContents::OnGotCatalogEntries,
weak_ptr_factory_.GetWeakPtr()));
@@ -259,10 +260,9 @@ TaskViewer::TaskViewer() {}
TaskViewer::~TaskViewer() {}
void TaskViewer::Initialize(mojo::Connector* connector,
- const std::string& url,
- const std::string& user_id,
+ const mojo::Identity& identity,
uint32_t id) {
- tracing_.Initialize(connector, url);
+ tracing_.Initialize(connector, identity.name());
aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
views::WindowManagerConnection::Create(connector);
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/wm/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698