Allow client process information to be passed via Connector::Connect().

mojo/services/package_manager/package_manager.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_PACKAGE_MANAGER_PACKAGE_MANAGER_H_
 #define MOJO_SERVICES_PACKAGE_MANAGER_PACKAGE_MANAGER_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/package_manager/public/interfaces/catalog.mojom.h"
 #include "mojo/services/package_manager/public/interfaces/resolver.mojom.h"
-#include "mojo/services/package_manager/public/interfaces/shell_resolver.mojom.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/interfaces/shell_resolver.mojom.h"
 #include "url/gurl.h"
 
 namespace package_manager {
 // A set of names of interfaces that may be exposed to an application.
 using AllowedInterfaces = std::set<std::string>;
 // A map of allowed applications to allowed interface sets. See shell.mojom for
 // more details.
 using CapabilityFilter = std::map<std::string, AllowedInterfaces>;
 
 // Static information about an application package known to the PackageManager.
@@ skipping 29 matching lines @@
   // Returns a serialized list of the apps. Each entry in the returned list
   // corresponds to an app (as a dictionary). Each dictionary has a name,
   // display name and capabilities. The return value is owned by the caller.
   virtual const base::ListValue* GetStore() = 0;
 
   // Write the catalog to the store. Called when the PackageManagerImpl learns
   // of a newly encountered application.
   virtual void UpdateStore(scoped_ptr<base::ListValue> store) = 0;
 };
 
-class PackageManager : public mojo::ShellClient,
-                       public mojo::InterfaceFactory<mojom::Resolver>,
-                       public mojo::InterfaceFactory<mojom::ShellResolver>,
-                       public mojo::InterfaceFactory<mojom::Catalog>,
-                       public mojom::Resolver,
-                       public mojom::ShellResolver,
-                       public mojom::Catalog {
+class PackageManager
+    : public mojo::ShellClient,
+      public mojo::InterfaceFactory<mojom::Resolver>,
+      public mojo::InterfaceFactory<mojo::shell::mojom::ShellResolver>,
+      public mojo::InterfaceFactory<mojom::Catalog>,
+      public mojom::Resolver,
+      public mojo::shell::mojom::ShellResolver,
+      public mojom::Catalog {
  public:
   // If |register_schemes| is true, mojo: and exe: schemes are registered as
   // "standard".
   PackageManager(base::TaskRunner* blocking_pool,
                  scoped_ptr<ApplicationCatalogStore> catalog);
   ~PackageManager() override;
 
  private:
   using MojoNameAliasMap =
       std::map<std::string, std::pair<std::string, std::string>>;
 
   // mojo::ShellClient:
   bool AcceptConnection(mojo::Connection* connection) override;
 
   // mojo::InterfaceFactory<mojom::Resolver>:
   void Create(mojo::Connection* connection,
               mojom::ResolverRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::ShellResolver>:
+  // mojo::InterfaceFactory<mojo::shell::mojom::ShellResolver>:
   void Create(mojo::Connection* connection,
-              mojom::ShellResolverRequest request) override;
+              mojo::shell::mojom::ShellResolverRequest request) override;
 
   // mojo::InterfaceFactory<mojom::Catalog>:
   void Create(mojo::Connection* connection,
               mojom::CatalogRequest request) override;
 
   // mojom::Resolver:
   void ResolveResponse(
       mojo::URLResponsePtr response,
       const ResolveResponseCallback& callback) override;
   void ResolveInterfaces(mojo::Array<mojo::String> interfaces,
                          const ResolveInterfacesCallback& callback) override;
   void ResolveMIMEType(const mojo::String& mime_type,
                        const ResolveMIMETypeCallback& callback) override;
   void ResolveProtocolScheme(
       const mojo::String& scheme,
       const ResolveProtocolSchemeCallback& callback) override;
 
-  // mojom::ShellResolver:
+  // mojo::shell::mojom::ShellResolver:
   void ResolveMojoName(const mojo::String& mojo_name,
                        const ResolveMojoNameCallback& callback) override;
 
   // mojom::Catalog:
   void GetEntries(mojo::Array<mojo::String> names,
                   const GetEntriesCallback& callback) override;
 
   // Completes resolving a Mojo name from the Shell after the resolved name has
   // been added to the catalog and the manifest read.
   void CompleteResolveMojoName(const std::string& resolved_name,
@@ skipping 27 matching lines @@
 
   // Called once the manifest is read and |this| hasn't been deleted.
   void OnReadManifestImpl(const std::string& name,
                           const ResolveMojoNameCallback& callback,
                           scoped_ptr<base::Value> manifest);
 
   base::TaskRunner* blocking_pool_;
   GURL system_package_dir_;
 
   mojo::BindingSet<mojom::Resolver> resolver_bindings_;
-  mojo::BindingSet<mojom::ShellResolver> shell_resolver_bindings_;
+  mojo::BindingSet<mojo::shell::mojom::ShellResolver> shell_resolver_bindings_;
   mojo::BindingSet<mojom::Catalog> catalog_bindings_;
 
   scoped_ptr<ApplicationCatalogStore> catalog_store_;
   std::map<std::string, ApplicationInfo> catalog_;
 
   // Used when an app handles multiple names. Maps from app (as name) to name of
   // app that is responsible for handling it. The value is a pair of the name of
   // the handler along with a qualifier.
   MojoNameAliasMap mojo_name_aliases_;
 
   std::map<std::string, std::string> qualifiers_;
 
   base::WeakPtrFactory<PackageManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageManager);
 };
 
 }  // namespace package_manager
 
 #endif  // MOJO_SERVICES_PACKAGE_MANAGER_PACKAGE_MANAGER_H_