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/json/json_file_value_serializer.h"
+#include "base/json/json_reader.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 "url/gurl.h"
 #include "url/url_util.h"
 
 namespace catalog {
 namespace {
 
@@ skipping 43 matching lines @@
 }
 
 }  // namespace
 
 ReadManifestResult::ReadManifestResult() {}
 ReadManifestResult::~ReadManifestResult() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // Catalog, public:
 
-Catalog::Catalog(scoped_ptr<Store> store, base::TaskRunner* file_task_runner)
-    : store_(std::move(store)),
+Catalog::Catalog(scoped_ptr<Store> store,
+                 base::TaskRunner* file_task_runner,
+                 Delegate* delegate)
+    : delegate_(delegate),
+      store_(std::move(store)),
       file_task_runner_(file_task_runner),
       weak_factory_(this) {
   PathService::Get(base::DIR_MODULE, &system_package_dir_);
   DeserializeCatalog();
 }
 
 Catalog::~Catalog() {}
 
 void Catalog::BindResolver(mojom::ResolverRequest request) {
   resolver_bindings_.AddBinding(this, std::move(request));
@@ skipping 41 matching lines @@
   if (type != "mojo" && type != "exe") {
     scoped_ptr<Entry> entry(new Entry(mojo_name));
     callback.Run(mojo::shell::mojom::ResolveResult::From(*entry));
     return;
   }
 
   auto entry = catalog_.find(mojo_name);
   if (entry != catalog_.end()) {
     callback.Run(mojo::shell::mojom::ResolveResult::From(*entry->second));
   } else {
-    base::PostTaskAndReplyWithResult(
-        file_task_runner_, FROM_HERE,
-        base::Bind(&ReadManifest, system_package_dir_, mojo_name),
-        base::Bind(&Catalog::OnReadManifest, weak_factory_.GetWeakPtr(),
-                   mojo_name, callback));
+    std::string manifest_contents;
+    if (delegate_ &&
+        delegate_->GetApplicationManifest(mojo_name.To<std::string>(),
+                                          &manifest_contents)) {
+      // We don't invoke the callback synchronously in this case to avoid
+      // surprising the caller with possible re-entry.
+      scoped_ptr<ReadManifestResult> result(new ReadManifestResult);
+      result->manifest_root = base::JSONReader::Read(manifest_contents);
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
+          FROM_HERE,
+          base::Bind(&Catalog::OnReadManifest, weak_factory_.GetWeakPtr(),
+                     mojo_name, callback, base::Passed(&result)));
+    } else {
+      base::PostTaskAndReplyWithResult(
+          file_task_runner_, FROM_HERE,
+          base::Bind(&ReadManifest, system_package_dir_, mojo_name),
+          base::Bind(&Catalog::OnReadManifest, weak_factory_.GetWeakPtr(),
+                     mojo_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 57 matching lines @@
   DCHECK(entry);
   if (catalog_.end() != catalog_.find(entry->name()))
     return;
   for (auto child : entry->applications())
     AddEntryToCatalog(make_scoped_ptr(child));
   catalog_[entry->name()] = std::move(entry);
   SerializeCatalog();
 }
 
 }  // namespace catalog