Implement a system-level entry cache so that packages loaded from the system dir can be visible to …

mojo/services/catalog/catalog.h

 // 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.
 
 #ifndef MOJO_SERVICES_CATALOG_CATALOG_H_
 #define MOJO_SERVICES_CATALOG_CATALOG_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/services/catalog/entry.h"
 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
 #include "mojo/services/catalog/store.h"
+#include "mojo/services/catalog/types.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/interfaces/shell_resolver.mojom.h"
 
 namespace catalog {
 
 class Store;
 
 struct ReadManifestResult {
   ReadManifestResult();
   ~ReadManifestResult();
   scoped_ptr<base::Value> manifest_root;
   base::FilePath package_dir;
 };
 
 class Catalog : public mojom::Resolver,
                 public mojo::shell::mojom::ShellResolver,
                 public mojom::Catalog {
  public:
-  Catalog(scoped_ptr<Store> store, base::TaskRunner* file_task_runner);
+  Catalog(scoped_ptr<Store> store,
+          base::TaskRunner* file_task_runner,
+          EntryCache* system_catalog);
   ~Catalog() override;
 
   void BindResolver(mojom::ResolverRequest request);
   void BindShellResolver(mojo::shell::mojom::ShellResolverRequest request);
   void BindCatalog(mojom::CatalogRequest request);
 
  private:
   using MojoNameAliasMap =
       std::map<std::string, std::pair<std::string, std::string>>;
 
@@ skipping 23 matching lines @@
 
   // Receives the result of manifest parsing on |file_task_runner_|, may be
   // received after the catalog object that issued the request is destroyed.
   static void OnReadManifest(base::WeakPtr<Catalog> catalog,
                              const std::string& name,
                              const ResolveMojoNameCallback& callback,
                              scoped_ptr<ReadManifestResult> result);
 
   // Populate the catalog with data from |entry|, and pass it to the client
   // via callback.
-  void AddEntryToCatalog(scoped_ptr<Entry> entry);
+  void AddEntryToCatalog(scoped_ptr<Entry> entry, bool is_system_catalog);
 
   // Directory that contains packages and executables visible to all users.
   base::FilePath system_package_dir_;
-
-  // TODO(beng): add user package dir.
+  // Directory that contains packages visible to this Catalog instance's user.
+  base::FilePath user_package_dir_;
 
   // User-specific persistent storage of package manifests and other settings.
   scoped_ptr<Store> store_;
 
   // Task runner for performing file operations.
   base::TaskRunner* file_task_runner_;
 
   mojo::BindingSet<mojom::Resolver> resolver_bindings_;
   mojo::BindingSet<mojo::shell::mojom::ShellResolver> shell_resolver_bindings_;
   mojo::BindingSet<mojom::Catalog> catalog_bindings_;
 
-  // Mojo name -> Entry storage, constructed from Store/package manifests.
-  std::map<std::string, scoped_ptr<Entry>> catalog_;
+  // The current user's packages, constructed from Store/package manifests.
+  EntryCache user_catalog_;
+  // Same as above, but for system-level (visible to all-users) packages and
+  // executables.
+  EntryCache* system_catalog_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // MOJO_SERVICES_CATALOG_CATALOG_H_