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..1bab5d25a774d221112d35d4e8aa566d336f7a54 100644
--- a/mojo/services/catalog/factory.h
+++ b/mojo/services/catalog/factory.h
@@ -12,6 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/services/catalog/catalog.h"
 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
 #include "mojo/shell/public/cpp/shell_client.h"
@@ -28,7 +29,6 @@ class ShellConnection;
 
 namespace catalog {
 
-class Catalog;
 class Store;
 
 // Creates and owns an instance of the catalog. Exposes a ShellClientPtr that
@@ -39,7 +39,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);
+  // |delegate| may be null.
+  Factory(base::TaskRunner* file_task_runner,
+          scoped_ptr<Store> store,
+          Catalog::Delegate* delegate);
   ~Factory() override;
 
   mojo::shell::mojom::ShellClientPtr TakeShellClient();
@@ -64,6 +67,7 @@ class Factory
 
   base::TaskRunner* file_task_runner_;
   scoped_ptr<Store> store_;
+  Catalog::Delegate* delegate_;
 
   mojo::shell::mojom::ShellClientPtr shell_client_;
   scoped_ptr<mojo::ShellConnection> shell_connection_;