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

Unified Diff: services/catalog/catalog.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 | « mash/runner/main.cc ('k') | services/catalog/catalog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/catalog.h
diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
index 870817fafc0a8b5d3884b305676e684fdf3276bd..691139c8341882e2a5f7c743e6a73f07969e043d 100644
--- a/services/catalog/catalog.h
+++ b/services/catalog/catalog.h
@@ -24,6 +24,7 @@
namespace base {
class SequencedWorkerPool;
class SingleThreadTaskRunner;
+class Value;
}
namespace filesystem {
@@ -39,7 +40,6 @@ namespace catalog {
class Instance;
class ManifestProvider;
class Reader;
-class Store;
// Creates and owns an instance of the catalog. Exposes a ServicePtr that
// can be passed to the service manager, potentially in a different process.
@@ -51,13 +51,16 @@ class Catalog
public service_manager::InterfaceFactory<mojom::CatalogControl>,
public mojom::CatalogControl {
public:
+ // Constructs a catalog over a static manifest. This catalog never performs
+ // file I/O.
+ explicit Catalog(std::unique_ptr<base::Value> static_manifest);
+
// |manifest_provider| may be null.
Catalog(base::SequencedWorkerPool* worker_pool,
- std::unique_ptr<Store> store,
ManifestProvider* manifest_provider);
Catalog(base::SingleThreadTaskRunner* task_runner,
- std::unique_ptr<Store> store,
ManifestProvider* manifest_provider);
+
~Catalog() override;
// By default, "foo" resolves to a package named "foo". This allows
@@ -71,7 +74,7 @@ class Catalog
private:
class ServiceImpl;
- explicit Catalog(std::unique_ptr<Store> store);
+ Catalog();
// Starts a scane for system packages.
void ScanSystemPackageDir();
@@ -102,8 +105,6 @@ class Catalog
void SystemPackageDirScanned();
- std::unique_ptr<Store> store_;
-
service_manager::mojom::ServicePtr service_;
std::unique_ptr<service_manager::ServiceContext> service_context_;
« no previous file with comments | « mash/runner/main.cc ('k') | services/catalog/catalog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698