Load application manifests from resources

mojo/services/catalog/factory.cc

Index: mojo/services/catalog/factory.cc
diff --git a/mojo/services/catalog/factory.cc b/mojo/services/catalog/factory.cc
index 7087af7d4b015cc245e88313eeb2cacaa8476c9b..e56d18d19fa1100c8b882c49eec8d5362de5a6a2 100644
--- a/mojo/services/catalog/factory.cc
+++ b/mojo/services/catalog/factory.cc
@@ -11,9 +11,12 @@
 
 namespace catalog {
 
-Factory::Factory(base::TaskRunner* file_task_runner, scoped_ptr<Store> store)
+Factory::Factory(base::TaskRunner* file_task_runner,
+                 scoped_ptr<Store> store,
+                 Catalog::Delegate* delegate)
     : file_task_runner_(file_task_runner),
       store_(std::move(store)),
+      delegate_(delegate),
       weak_factory_(this) {
   mojo::shell::mojom::ShellClientRequest request = GetProxy(&shell_client_);
   shell_connection_.reset(new mojo::ShellConnection(this, std::move(request)));
@@ -58,7 +61,8 @@ Catalog* Factory::GetCatalogForUserId(const std::string& user_id) {
     return it->second.get();
 
   // TODO(beng): There needs to be a way to load the store from different users.
-  Catalog* instance = new Catalog(file_task_runner_, std::move(store_));
+  Catalog* instance =
+      new Catalog(file_task_runner_, std::move(store_), delegate_);
   catalogs_[user_id] = make_scoped_ptr(instance);
   return instance;
 }