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

Unified Diff: services/service_manager/standalone/context.cc

Issue 2573283002: Use a static catalog manifest for the standalone Mash runner (Closed)
Patch Set: . Created 4 years 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
Index: services/service_manager/standalone/context.cc
diff --git a/services/service_manager/standalone/context.cc b/services/service_manager/standalone/context.cc
index 14ace78f7aaedc6934be9ebdbb643dd13c0fe211..f8f604f423015a45cf446cf371e69eff443cc620 100644
--- a/services/service_manager/standalone/context.cc
+++ b/services/service_manager/standalone/context.cc
@@ -161,11 +161,13 @@ void Context::Init(std::unique_ptr<InitParams> init_params) {
blocking_pool_.get(),
init_params ? init_params->service_process_launcher_delegate
: nullptr);
- std::unique_ptr<catalog::Store> store;
- if (init_params)
- store = std::move(init_params->catalog_store);
- catalog_.reset(
- new catalog::Catalog(blocking_pool_.get(), std::move(store), nullptr));
+ if (init_params && init_params->static_catalog) {
+ catalog_.reset(
+ new catalog::Catalog(std::move(init_params->static_catalog)));
+ } else {
+ catalog_.reset(
+ new catalog::Catalog(blocking_pool_.get(), nullptr));
+ }
service_manager_.reset(
new ServiceManager(std::move(service_process_launcher_factory),
catalog_->TakeService()));
« no previous file with comments | « services/service_manager/standalone/context.h ('k') | services/service_manager/standalone/desktop/launcher_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698