diff options
| author | ben <ben@chromium.org> | 2016-03-08 20:08:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 04:09:07 +0000 |
| commit | c18f9cc14a916cf131b6cb8f001e469d0a26de43 (patch) | |
| tree | 9d2b0e50d2c344ac144818357ae9a5136c59dd5a /mash | |
| parent | f7a51f72543e18c667a45178d97cbab5337bcc45 (diff) | |
| download | chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.zip chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.tar.gz chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.tar.bz2 | |
Rename PackageManager->Catalog.
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1775243002
Cr-Commit-Position: refs/heads/master@{#380062}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/DEPS | 2 | ||||
| -rw-r--r-- | mash/task_viewer/BUILD.gn | 2 | ||||
| -rw-r--r-- | mash/task_viewer/task_viewer.cc | 13 |
3 files changed, 8 insertions, 9 deletions
@@ -7,8 +7,8 @@ include_rules = [ "+mojo/common", "+mojo/converters", "+mojo/public", + "+mojo/services/catalog/public", "+mojo/services/network/public", - "+mojo/services/package_manager/public", "+mojo/services/tracing/public", "+third_party/skia/include", "+ui", diff --git a/mash/task_viewer/BUILD.gn b/mash/task_viewer/BUILD.gn index 786bd28..9f076ff 100644 --- a/mash/task_viewer/BUILD.gn +++ b/mash/task_viewer/BUILD.gn @@ -19,7 +19,7 @@ mojo_native_application("task_viewer") { ":manifest", "//base", "//mojo/public/cpp/bindings", - "//mojo/services/package_manager/public/interfaces", + "//mojo/services/catalog/public/interfaces", "//mojo/services/tracing/public/cpp", "//mojo/shell/public/cpp", "//mojo/shell/public/cpp:sources", diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc index 4a26c4f..0e01a00 100644 --- a/mash/task_viewer/task_viewer.cc +++ b/mash/task_viewer/task_viewer.cc @@ -14,7 +14,7 @@ #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" @@ -39,7 +39,7 @@ class TaskViewerContents : public views::WidgetDelegateView, 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), @@ -195,8 +195,7 @@ class TaskViewerContents : public views::WidgetDelegateView, } 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()) { @@ -240,7 +239,7 @@ class TaskViewerContents : public views::WidgetDelegateView, } 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_; @@ -274,8 +273,8 @@ void TaskViewer::Initialize(mojo::Connector* connector, 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)); |