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

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

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
« no previous file with comments | « services/service_manager/standalone/BUILD.gn ('k') | services/service_manager/standalone/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/standalone/context.h
diff --git a/services/service_manager/standalone/context.h b/services/service_manager/standalone/context.h
index 64b3fc41c838527029d661a4cd071ccfdca59d65..17f52b6d54fc685b953c81e399be50b442cffe03 100644
--- a/services/service_manager/standalone/context.h
+++ b/services/service_manager/standalone/context.h
@@ -12,7 +12,9 @@
#include "base/memory/ref_counted.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
+#include "base/values.h"
#include "mojo/edk/embedder/process_delegate.h"
+#include "services/service_manager/runner/host/service_process_launcher.h"
#include "services/service_manager/service_manager.h"
#include "services/service_manager/standalone/tracer.h"
#include "services/tracing/public/cpp/provider.h"
@@ -23,7 +25,6 @@ class SingleThreadTaskRunner;
namespace catalog {
class Catalog;
-class Store;
}
namespace service_manager {
@@ -39,7 +40,7 @@ class Context : public mojo::edk::ProcessDelegate {
ServiceProcessLauncher::Delegate*
service_process_launcher_delegate = nullptr;
- std::unique_ptr<catalog::Store> catalog_store;
+ std::unique_ptr<base::Value> static_catalog;
// If true the edk is initialized.
bool init_edk = true;
};
« no previous file with comments | « services/service_manager/standalone/BUILD.gn ('k') | services/service_manager/standalone/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698