First cut at "content handling" support in Mojo.

mojo/shell/context.cc

 // Copyright 2013 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/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 51 matching lines @@
 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 class Context::NativeViewportServiceLoader : public ServiceLoader {
  public:
   NativeViewportServiceLoader() {}
   virtual ~NativeViewportServiceLoader() {}
 
  private:
-  virtual void LoadService(ServiceManager* manager,
-                           const GURL& url,
-                           ScopedMessagePipeHandle shell_handle) OVERRIDE {
-    app_.reset(services::CreateNativeViewportService(shell_handle.Pass()));
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      scoped_refptr<LoadServiceCallbacks> callbacks) OVERRIDE {
+    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
+    if (shell_handle.is_valid()) {

[DaveMoore, 2014/08/04 21:50:51]

Nit: no braces

[Aaron Boodman, 2014/08/05 05:44:54]

Done.

+      app_.reset(services::CreateNativeViewportService(shell_handle.Pass()));
+    }
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader);
 };
 
 Context::Context()
     : task_runners_(base::MessageLoop::current()->message_loop_proxy()) {
   setup.Get();
 
   for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
     mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
 
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (cmdline->HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
+  DynamicServiceLoader* dynamic_service_loader =
+      new DynamicServiceLoader(this, runner_factory.Pass());
+  dynamic_service_loader->set_content_handler(
+      "text/plain", GURL("mojo://mojo_content_handler_demo/"));

[DaveMoore, 2014/08/04 21:50:51]

mojo_content_handler_demo?

[Aaron Boodman, 2014/08/05 05:44:54]

I don't understand this comment, but I've removed this line in favor of a
--content-handlers switch.

   service_manager_.set_default_loader(
-      scoped_ptr<ServiceLoader>(
-          new DynamicServiceLoader(this, runner_factory.Pass())));
+      scoped_ptr<ServiceLoader>(dynamic_service_loader));
+
   // The native viewport service synchronously waits for certain messages. If we
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(
           new UIServiceLoader(
               scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
               this)),
       GURL("mojo:mojo_native_viewport_service"));
@@ skipping 49 matching lines @@
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
   service_manager_.TerminateShellConnections();
 }
 
 Context::~Context() {
   Shutdown();
 }
 
 }  // namespace shell
 }  // namespace mojo