Load application manifests from resources

mojo/services/catalog/catalog.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/catalog/catalog.h"
 
 #include "base/bind.h"
 #include "base/strings/string_split.h"
 #include "base/task_runner_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/services/catalog/entry.h"
 #include "mojo/services/catalog/store.h"
 #include "mojo/shell/public/cpp/names.h"
 #include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 namespace catalog {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Catalog, public:
 
-Catalog::Catalog(base::TaskRunner* blocking_pool, scoped_ptr<Store> store)
-    : store_(std::move(store)),
+Catalog::Catalog(base::TaskRunner* blocking_pool,
+                 scoped_ptr<Store> store,
+                 Delegate* delegate)
+    : delegate_(delegate),
+      store_(std::move(store)),
       weak_factory_(this) {
   PathService::Get(base::DIR_MODULE, &package_path_);
   reader_.reset(new Reader(package_path_, blocking_pool));
   DeserializeCatalog();
 }
 
 Catalog::~Catalog() {}
 
 void Catalog::BindResolver(mojom::ResolverRequest request) {
   resolver_bindings_.AddBinding(this, std::move(request));
@@ skipping 43 matching lines @@
     resolved_name = alias_iter->second.first;
 
   std::string qualifier = mojo::GetNamePath(resolved_name);
   auto qualifier_iter = qualifiers_.find(resolved_name);
   if (qualifier_iter != qualifiers_.end())
     qualifier = qualifier_iter->second;
 
   if (IsNameInCatalog(resolved_name)) {
     CompleteResolveMojoName(resolved_name, qualifier, callback);
   } else {
-    reader_->Read(resolved_name,
-                  base::Bind(&Catalog::OnReadEntry, weak_factory_.GetWeakPtr(),
-                             resolved_name, callback));
+    std::string manifest_contents;
+    if (delegate_ &&
+        delegate_->GetApplicationManifest(resolved_name, &manifest_contents)) {
+      // We don't invoke the callback synchronously in this case to avoid
+      // surprising the caller with possible re-entry.
+      scoped_ptr<Entry> entry = reader_->Parse(manifest_contents);
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
+          FROM_HERE,
+          base::Bind(&Catalog::OnReadEntry, weak_factory_.GetWeakPtr(),
+                     resolved_name, callback, base::Passed(&entry)));
+    } else {
+      reader_->Read(
+          resolved_name,
+          base::Bind(&Catalog::OnReadEntry, weak_factory_.GetWeakPtr(),
+                     resolved_name, callback));
+    }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Catalog, mojom::Catalog:
 
 void Catalog::GetEntries(mojo::Array<mojo::String> names,
                          const GetEntriesCallback& callback) {
   mojo::Map<mojo::String, mojom::CatalogEntryPtr> entries;
   std::vector<mojo::String> names_vec = names.PassStorage();
@@ skipping 109 matching lines @@
 
   SerializeCatalog();
 
   auto qualifier_iter = qualifiers_.find(name);
   DCHECK(qualifier_iter != qualifiers_.end());
   std::string qualifier = qualifier_iter->second;
   CompleteResolveMojoName(name, qualifier, callback);
 }
 
 }  // namespace catalog