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 /mojo/shell/standalone | |
| 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 'mojo/shell/standalone')
| -rw-r--r-- | mojo/shell/standalone/BUILD.gn | 2 | ||||
| -rw-r--r-- | mojo/shell/standalone/context.cc | 8 | ||||
| -rw-r--r-- | mojo/shell/standalone/context.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mojo/shell/standalone/BUILD.gn b/mojo/shell/standalone/BUILD.gn index e9e62b4..536f5bf 100644 --- a/mojo/shell/standalone/BUILD.gn +++ b/mojo/shell/standalone/BUILD.gn @@ -37,7 +37,7 @@ source_set("lib") { "//components/tracing:startup_tracing", "//mojo/edk/system", "//mojo/message_pump", - "//mojo/services/package_manager:lib", + "//mojo/services/catalog:lib", "//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/interfaces", "//mojo/shell", diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index a6fcbed..23dc96b 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -29,7 +29,7 @@ #include "components/tracing/tracing_switches.h" #include "mojo/edk/embedder/embedder.h" #include "mojo/public/cpp/bindings/strong_binding.h" -#include "mojo/services/package_manager/package_manager.h" +#include "mojo/services/catalog/catalog.h" #include "mojo/services/tracing/public/cpp/switches.h" #include "mojo/services/tracing/public/cpp/trace_provider_impl.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" @@ -152,11 +152,11 @@ void Context::Init(scoped_ptr<InitParams> init_params) { runner_factory.reset(new OutOfProcessNativeRunnerFactory( blocking_pool_.get(), native_runner_delegate)); } - scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog; + scoped_ptr<catalog::Store> catalog_store; if (init_params) - app_catalog = std::move(init_params->app_catalog); + catalog_store = std::move(init_params->catalog_store); shell_.reset(new Shell(std::move(runner_factory), blocking_pool_.get(), - std::move(app_catalog))); + std::move(catalog_store))); shell::mojom::InterfaceProviderPtr tracing_remote_interfaces; shell::mojom::InterfaceProviderPtr tracing_local_interfaces; diff --git a/mojo/shell/standalone/context.h b/mojo/shell/standalone/context.h index 6daf8d1..91ff248 100644 --- a/mojo/shell/standalone/context.h +++ b/mojo/shell/standalone/context.h @@ -19,8 +19,8 @@ namespace base { class SingleThreadTaskRunner; } -namespace package_manager { -class ApplicationCatalogStore; +namespace catalog { +class Store; } namespace mojo { @@ -35,7 +35,7 @@ class Context : public edk::ProcessDelegate { ~InitParams(); NativeRunnerDelegate* native_runner_delegate = nullptr; - scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog; + scoped_ptr<catalog::Store> catalog_store; }; Context(); |