mojo: Use ContentHandlers to bundle multiple Applications into a module.

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"
@@ skipping 71 matching lines @@
     ptr->Bind(service_handle.Pass());
   }
 
   ScopedMessagePipeHandle ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name);
 
   void RegisterContentHandler(const std::string& mime_type,
                               const GURL& content_handler_url);
 
+  // Registers a package redirect. When attempting to load |alias|, it will
+  // instead redirect to |content_handler_package|, which is a content handler
+  // which will be passed the |alias| as the URLResponse::url.
+  void RegisterApplicationPackageRedirect(const GURL& alias,

[Ben Goodger (Google), 2015/05/01 17:10:33]

RegisterApplicationPackageAlias

[Elliot Glaysher, 2015/05/01 17:28:43]

Changed all 'redirect's to 'alias' here and in the implementation.

+                                          const GURL& content_handler_package);
+
   // Sets the default Loader to be used if not overridden by SetLoaderForURL()
   // or SetLoaderForScheme().
   void set_default_loader(scoped_ptr<ApplicationLoader> loader) {
     default_loader_ = loader.Pass();
   }
   void set_native_runner_factory(
       scoped_ptr<NativeRunnerFactory> runner_factory) {
     native_runner_factory_ = runner_factory.Pass();
   }
   void set_blocking_pool(base::SequencedWorkerPool* blocking_pool) {
@@ skipping 19 matching lines @@
   // Applications connected by this ApplicationManager will observe pipe errors
   // and have a chance to shutdown.
   void TerminateShellConnections();
 
   // Removes a ShellImpl when it encounters an error.
   void OnShellImplError(ShellImpl* shell_impl);
 
  private:
   class ContentHandlerConnection;
 
-  typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
-  typedef std::map<GURL, ApplicationLoader*> URLToLoaderMap;
-  typedef std::map<Identity, ShellImpl*> IdentityToShellImplMap;
-  typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap;
-  typedef std::map<std::string, GURL> MimeTypeToURLMap;
-  typedef std::map<GURL, NativeRunnerFactory::Options> URLToNativeOptionsMap;
+  using ApplicationPackagedRedirect = std::map<GURL, GURL>;

[Ben Goodger (Google), 2015/05/01 17:10:33]

ApplicationPackageAliasMap

+  using IdentityToShellImplMap = std::map<Identity, ShellImpl*>;
+  using MimeTypeToURLMap = std::map<std::string, GURL>;
+  using SchemeToLoaderMap = std::map<std::string, ApplicationLoader*>;
+  using URLToContentHandlerMap = std::map<GURL, ContentHandlerConnection*>;
+  using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
+  using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>;
 
   void ConnectToApplicationWithParameters(
       const GURL& application_url,
       const GURL& requestor_url,
       InterfaceRequest<ServiceProvider> services,
       ServiceProviderPtr exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& pre_redirect_parameters);
 
   bool ConnectToRunningApplication(const GURL& resolved_url,
@@ skipping 59 matching lines @@
   void CleanupRunner(NativeRunner* runner);
 
   Delegate* const delegate_;
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   SchemeToLoaderMap scheme_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
 
+  ApplicationPackagedRedirect application_package_redirect_;
   IdentityToShellImplMap identity_to_shell_impl_;
   URLToContentHandlerMap url_to_content_handler_;
   // Note: The keys are URLs after mapping and resolving.
   URLToNativeOptionsMap url_to_native_options_;
 
   base::SequencedWorkerPool* blocking_pool_;
   NetworkServicePtr network_service_;
   MimeTypeToURLMap mime_type_to_url_;
   ScopedVector<NativeRunner> native_runners_;
   bool disable_cache_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_