Rename PackageManager->Catalog.

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"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/package_manager/public/interfaces/catalog.mojom.h"
+#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/base/models/table_model.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace task_viewer {
 namespace {
 
 using mojo::shell::mojom::InstanceInfoPtr;
 
 class TaskViewerContents : public views::WidgetDelegateView,
                            public ui::TableModel,
                            public views::ButtonListener,
                            public mojo::shell::mojom::InstanceListener {
  public:
   TaskViewerContents(mojo::shell::mojom::InstanceListenerRequest request,
-                     package_manager::mojom::CatalogPtr catalog)
+                     catalog::mojom::CatalogPtr catalog)
       : binding_(this, std::move(request)),
         catalog_(std::move(catalog)),
         table_view_(nullptr),
         table_view_parent_(nullptr),
         kill_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Kill Process"))),
         observer_(nullptr),
         weak_ptr_factory_(this) {
     // We don't want to show an empty UI on startup, so just block until we
     // receive the initial set of applications.
@@ skipping 135 matching lines @@
         return true;
     }
     return false;
   }
 
   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) {
+      mojo::Map<mojo::String, catalog::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->display_name;
         observer_->OnItemsChanged(
             static_cast<int>(it - instances_.begin()), 1);
       }
     }
   }
 
@@ skipping 23 matching lines @@
     // TODO(beng): use resources.
     pid_column.title  = base::ASCIIToUTF16("PID");
     pid_column.width = 50;
     pid_column.sortable = true;
     columns.push_back(pid_column);
 
     return columns;
   }
 
   mojo::Binding<mojo::shell::mojom::InstanceListener> binding_;
-  package_manager::mojom::CatalogPtr catalog_;
+  catalog::mojom::CatalogPtr catalog_;
 
   views::TableView* table_view_;
   views::View* table_view_parent_;
   views::LabelButton* kill_button_;
   ui::TableModelObserver* observer_;
 
   std::vector<scoped_ptr<InstanceInfo>> instances_;
 
   base::WeakPtrFactory<TaskViewerContents> weak_ptr_factory_;
 
@@ skipping 13 matching lines @@
   aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
   views::WindowManagerConnection::Create(connector);
 
   mojo::shell::mojom::ShellPtr shell;
   connector->ConnectToInterface("mojo:shell", &shell);
 
   mojo::shell::mojom::InstanceListenerPtr listener;
   mojo::shell::mojom::InstanceListenerRequest request = GetProxy(&listener);
   shell->AddInstanceListener(std::move(listener));
 
-  package_manager::mojom::CatalogPtr catalog;
-  connector->ConnectToInterface("mojo:package_manager", &catalog);
+  catalog::mojom::CatalogPtr catalog;
+  connector->ConnectToInterface("mojo:catalog", &catalog);
 
   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