Change Mojo URLs to structured names

mash/task_viewer/task_viewer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 126 matching lines @@
     DCHECK(row < static_cast<int>(instances_.size()));
     base::Process process = base::Process::Open(instances_[row]->pid);
     process.Terminate(9, true);
   }
 
   // Overridden from mojo::shell::mojom::ApplicationManagerListener:
   void SetRunningApplications(
       mojo::Array<ApplicationInfoPtr> applications) override {
     // This callback should only be called with an empty model.
     DCHECK(instances_.empty());
-    mojo::Array<mojo::String> urls;
+    mojo::Array<mojo::String> names;
     for (size_t i = 0; i < applications.size(); ++i) {
-      InsertInstance(applications[i]->id, applications[i]->url,
+      InsertInstance(applications[i]->id, applications[i]->name,
                      applications[i]->pid);
-      urls.push_back(applications[i]->url);
+      names.push_back(applications[i]->name);
     }
-    catalog_->GetEntries(std::move(urls),
+    catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
   void ApplicationInstanceCreated(ApplicationInfoPtr application) override {
     DCHECK(!ContainsId(application->id));
-    InsertInstance(application->id, application->url, application->pid);
+    InsertInstance(application->id, application->name, application->pid);
     observer_->OnItemsAdded(static_cast<int>(instances_.size()), 1);
-    mojo::Array<mojo::String> urls;
-    urls.push_back(application->url);
-    catalog_->GetEntries(std::move(urls),
+    mojo::Array<mojo::String> names;
+    names.push_back(application->name);
+    catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
   void ApplicationInstanceDestroyed(uint32_t id) override {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       if ((*it)->id == id) {
         observer_->OnItemsRemoved(
             static_cast<int>(it - instances_.begin()), 1);
         instances_.erase(it);
         return;
@@ skipping 23 matching lines @@
   void InsertInstance(uint32_t id, const std::string& url, uint32_t pid) {
     instances_.push_back(make_scoped_ptr(new InstanceInfo(id, url, pid)));
   }
 
   void OnGotCatalogEntries(
       mojo::Map<mojo::String,
                 package_manager::mojom::CatalogEntryPtr> entries) {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       auto entry_it = entries.find((*it)->url);
       if (entry_it != entries.end()) {
-        (*it)->name = entry_it->second->name;
+        (*it)->name = entry_it->second->display_name;
         observer_->OnItemsChanged(
             static_cast<int>(it - instances_.begin()), 1);
       }
     }
   }
 
   static std::vector<ui::TableColumn> GetColumns() {
     std::vector<ui::TableColumn> columns;
 
     ui::TableColumn name_column;
@@ skipping 65 matching lines @@
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
       std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       task_viewer, gfx::Rect(10, 10, 500, 500));
   window->Show();
 }
 
 }  // namespace task_viewer
 }  // namespace main