Adds a way to determine id of content handler that created app

mojo/shell/application_manager.h

 // Copyright 2014 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 SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/updater/updater.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner.h"
@@ skipping 42 matching lines @@
     static bool HasCreatedInstance();
     // Returns true if there is a ApplicationInstance for this URL.
     bool HasRunningInstanceForURL(const GURL& url) const;
 
    private:
     ApplicationManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
+  static const uint32_t kInvalidContentHandlerID = 0u;
+
   explicit ApplicationManager(Delegate* delegate);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   // |originator| can be NULL (e.g. for the first application or in tests), but
   // typically is non-NULL and identifies the instance initiating the
   // connection.
-  void ConnectToApplication(ApplicationInstance* originator,
-                            URLRequestPtr requested_url,
-                            const std::string& qualifier,
-                            const GURL& requestor_url,
-                            InterfaceRequest<ServiceProvider> services,
-                            ServiceProviderPtr exposed_services,
-                            const CapabilityFilter& capability_filter,
-                            const base::Closure& on_application_end);
+  // If this request is from a content handler then
+  // |requesting_content_handler_id| is the id of the content handler. If this
+  // request is not from a content handler, |requesting_content_handler_id| is
+  // kInvalidContentHandlerID.
+  void ConnectToApplication(
+      ApplicationInstance* originator,
+      URLRequestPtr requested_url,
+      const std::string& qualifier,
+      const GURL& requestor_url,
+      uint32_t requesting_content_handler_id,
+      InterfaceRequest<ServiceProvider> services,
+      ServiceProviderPtr exposed_services,
+      const CapabilityFilter& capability_filter,
+      const base::Closure& on_application_end,
+      const Shell::ConnectToApplicationCallback& connect_callback);
 
   // Must only be used by shell internals and test code as it does not forward
   // capability filters.
   template <typename Interface>
   inline void ConnectToService(const GURL& application_url,
                                InterfacePtr<Interface>* ptr) {
     ScopedMessagePipeHandle service_handle =
         ConnectToServiceByName(application_url, Interface::Name_);
     ptr->Bind(InterfacePtrInfo<Interface>(service_handle.Pass(), 0u));
   }
@@ skipping 57 matching lines @@
   using ApplicationPackagedAlias = std::map<GURL, std::pair<GURL, std::string>>;
   using IdentityToApplicationInstanceMap =
       std::map<Identity, ApplicationInstance*>;
   using MimeTypeToURLMap = std::map<std::string, GURL>;
   using SchemeToLoaderMap = std::map<std::string, ApplicationLoader*>;
   using URLToContentHandlerMap =
       std::map<std::pair<GURL, std::string>, ContentHandlerConnection*>;
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
   using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>;
 
-  bool ConnectToRunningApplication(ApplicationInstance* originator,
-                                   const GURL& resolved_url,
-                                   const std::string& qualifier,
-                                   const GURL& requestor_url,
-                                   InterfaceRequest<ServiceProvider>* services,
-                                   ServiceProviderPtr* exposed_services,
-                                   const CapabilityFilter& filter);
+  bool ConnectToRunningApplication(
+      ApplicationInstance* originator,
+      const GURL& resolved_url,
+      const std::string& qualifier,
+      const GURL& requestor_url,
+      InterfaceRequest<ServiceProvider>* services,
+      ServiceProviderPtr* exposed_services,
+      const CapabilityFilter& filter,
+      const Shell::ConnectToApplicationCallback& connect_callback);
 
   bool ConnectToApplicationWithLoader(
       ApplicationInstance* originator,
       const GURL& requested_url,
       const std::string& qualifier,
       const GURL& resolved_url,
       const GURL& requestor_url,
+      uint32_t requesting_content_handler_id,
       InterfaceRequest<ServiceProvider>* services,
       ServiceProviderPtr* exposed_services,
       const CapabilityFilter& filter,
       const base::Closure& on_application_end,
+      const Shell::ConnectToApplicationCallback& connect_callback,
       ApplicationLoader* loader);
 
   InterfaceRequest<Application> RegisterInstance(
       ApplicationInstance* originator,
       const GURL& app_url,
       const std::string& qualifier,
       const GURL& requestor_url,
+      const uint32_t requesting_content_handler_id,
       InterfaceRequest<ServiceProvider> services,
       ServiceProviderPtr exposed_services,
       const CapabilityFilter& filter,
-      const base::Closure& on_application_end);
+      const base::Closure& on_application_end,
+      const Shell::ConnectToApplicationCallback& connect_callback,
+      ApplicationInstance** resulting_instance);
 
   // Called once |fetcher| has found app. |requested_url| is the url of the
   // requested application before any mappings/resolution have been applied.
-  void HandleFetchCallback(ApplicationInstance* originator,
-                           const GURL& requested_url,
-                           const std::string& qualifier,
-                           const GURL& requestor_url,
-                           InterfaceRequest<ServiceProvider> services,
-                           ServiceProviderPtr exposed_services,
-                           const CapabilityFilter& filter,
-                           const base::Closure& on_application_end,
-                           NativeApplicationCleanup cleanup,
-                           scoped_ptr<Fetcher> fetcher);
+  void HandleFetchCallback(
+      ApplicationInstance* originator,
+      const GURL& requested_url,
+      const std::string& qualifier,
+      const GURL& requestor_url,
+      uint32_t requesting_content_handler_id,
+      InterfaceRequest<ServiceProvider> services,
+      ServiceProviderPtr exposed_services,
+      const CapabilityFilter& filter,
+      const base::Closure& on_application_end,
+      const Shell::ConnectToApplicationCallback& connect_callback,
+      NativeApplicationCleanup cleanup,
+      scoped_ptr<Fetcher> fetcher);
 
   void RunNativeApplication(InterfaceRequest<Application> application_request,
                             bool start_sandboxed,
                             const NativeRunnerFactory::Options& options,
                             NativeApplicationCleanup cleanup,
                             scoped_ptr<Fetcher> fetcher,
                             const base::FilePath& file_path,
                             bool path_exists);
 
-  void LoadWithContentHandler(ApplicationInstance* originator,
-                              const GURL& content_handler_url,
-                              const GURL& requestor_url,
-                              const std::string& qualifier,
-                              const CapabilityFilter& filter,
-                              InterfaceRequest<Application> application_request,
-                              URLResponsePtr url_response);
+  void LoadWithContentHandler(
+      ApplicationInstance* originator,
+      const GURL& content_handler_url,
+      const GURL& requestor_url,
+      const std::string& qualifier,
+      const CapabilityFilter& filter,
+      const Shell::ConnectToApplicationCallback& connect_callback,
+      ApplicationInstance* app,
+      InterfaceRequest<Application> application_request,
+      URLResponsePtr url_response);
 
   // Returns the appropriate loader for |url|, or null if there is no loader
   // configured for the URL.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   void CleanupRunner(NativeRunner* runner);
 
   ScopedMessagePipeHandle ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name);
@@ skipping 12 matching lines @@
   // Note: The keys are URLs after mapping and resolving.
   URLToNativeOptionsMap url_to_native_options_;
 
   base::SequencedWorkerPool* blocking_pool_;
   NetworkServicePtr network_service_;
   URLLoaderFactoryPtr url_loader_factory_;
   updater::UpdaterPtr updater_;
   MimeTypeToURLMap mime_type_to_url_;
   ScopedVector<NativeRunner> native_runners_;
   bool disable_cache_;
+  // Counter used to assign ids to content_handlers.
+  uint32_t content_handler_id_counter_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
+Shell::ConnectToApplicationCallback EmptyConnectCallback();
+
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_