Load application manifests from resources

mojo/services/catalog/factory.h

Index: mojo/services/catalog/factory.h
diff --git a/mojo/services/catalog/factory.h b/mojo/services/catalog/factory.h
index 545acf36e7a4d8360d90e1d1d6f66ec34f0ed6dc..607dc3f5751497f27997354dd81b1d216c84799a 100644
--- a/mojo/services/catalog/factory.h
+++ b/mojo/services/catalog/factory.h
@@ -29,6 +29,7 @@ class ShellConnection;
 namespace catalog {
 
 class Catalog;
+class ManifestProvider;
 class Store;
 
 // Creates and owns an instance of the catalog. Exposes a ShellClientPtr that
@@ -39,7 +40,10 @@ class Factory
       public mojo::InterfaceFactory<mojom::Resolver>,
       public mojo::InterfaceFactory<mojo::shell::mojom::ShellResolver> {
  public:
-  Factory(base::TaskRunner* file_task_runner, scoped_ptr<Store> store);
+  // |manifest_provider| may be null.
+  Factory(base::TaskRunner* file_task_runner,
+          scoped_ptr<Store> store,
+          ManifestProvider* manifest_provider);
   ~Factory() override;
 
   mojo::shell::mojom::ShellClientPtr TakeShellClient();
@@ -62,8 +66,9 @@ class Factory
 
   Catalog* GetCatalogForUserId(const std::string& user_id);
 
-  base::TaskRunner* file_task_runner_;
+  base::TaskRunner* const file_task_runner_;
   scoped_ptr<Store> store_;
+  ManifestProvider* const manifest_provider_;
 
   mojo::shell::mojom::ShellClientPtr shell_client_;
   scoped_ptr<mojo::ShellConnection> shell_connection_;