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

mojo/shell/application_manager.cc

 // 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.
 
 #include "mojo/shell/application_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 295 matching lines @@
     return;
   }
 
   MimeTypeToURLMap::iterator iter = mime_type_to_url_.find(fetcher->MimeType());
   if (iter != mime_type_to_url_.end()) {
     LoadWithContentHandler(iter->second, request.Pass(),
                            fetcher->AsURLResponse(blocking_pool_, 0));
     return;
   }
 
+  auto redirect_iter = application_package_redirect_.find(app_url);
+  if (redirect_iter != application_package_redirect_.end()) {
+    URLResponsePtr response(URLResponse::New());
+    response->url = String::From(app_url.spec());
+    LoadWithContentHandler(redirect_iter->second,

[sky, 2015/04/30 21:59:08]

Doing it like you have here means multiple calls to ConnectToApplication() for
the same url (eg mojo:clipboard) will create multiple applications. For the
cases we care about, we don't want that. We still want only one mojo:clipboard.

[Elliot Glaysher, 2015/05/01 17:00:04]

I don't believe this is the case. Above, RegisterShell creates a ShellImpl for
the url and we are just filling in the InterfaceRequest<Application>.

+                           request.Pass(),
+                           response.Pass());
+    return;
+  }
+
   // TODO(aa): Sanity check that the thing we got looks vaguely like a mojo
   // application. That could either mean looking for the platform-specific dll
   // header, or looking for some specific mojo signature prepended to the
   // library.
   // TODO(vtl): (Maybe this should be done by the factory/runner?)
 
   GURL base_resolved_url = GetBaseURLAndQuery(fetcher->GetURL(), nullptr);
   NativeRunnerFactory::Options options;
   if (url_to_native_options_.find(base_resolved_url) !=
       url_to_native_options_.end()) {
@@ skipping 37 matching lines @@
 }
 
 void ApplicationManager::RegisterContentHandler(
     const std::string& mime_type,
     const GURL& content_handler_url) {
   DCHECK(content_handler_url.is_valid())
       << "Content handler URL is invalid for mime type " << mime_type;
   mime_type_to_url_[mime_type] = content_handler_url;
 }
 
+
+void ApplicationManager::RegisterApplicationPackageRedirect(
+    const GURL& alias,
+    const GURL& content_handler_package) {
+  application_package_redirect_[alias] = content_handler_package;
+}
+
 void ApplicationManager::LoadWithContentHandler(
     const GURL& content_handler_url,
     InterfaceRequest<Application> application_request,
     URLResponsePtr url_response) {
   ContentHandlerConnection* connection = nullptr;
   URLToContentHandlerMap::iterator iter =
       url_to_content_handler_.find(content_handler_url);
   if (iter != url_to_content_handler_.end()) {
     connection = iter->second;
   } else {
@@ skipping 81 matching lines @@
   return pipe.handle0.Pass();
 }
 
 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
   native_runners_.erase(
       std::find(native_runners_.begin(), native_runners_.end(), runner));
 }
 
 }  // namespace shell
 }  // namespace mojo