Simple multi-url support for mojo apps

examples/forwarding_content_handler/forwarding_content_handler.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 "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
 
 class ForwardingApplicationImpl : public Application {
  public:
   ForwardingApplicationImpl(InterfaceRequest<Application> request,
                             std::string target_url)

[qsr, 2015/02/27 15:01:40]

I don't understand this change.

This content handler expect to read a txt file that contains the URL of the app
to connect to.

You seems to have just ignore this parameter altogether.

[Aaron Boodman, 2015/02/27 16:54:44]

Whoopsie. fixed.

-      : binding_(this, request.Pass()),
-        target_url_(target_url) {
-  }
+      : binding_(this, request.Pass()) {}
 
  private:
   // Application:
   void Initialize(ShellPtr shell,
                   Array<String> args,
                   const mojo::String& url) override {
     shell_ = shell.Pass();
   }
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
-                        ServiceProviderPtr exposed_services) override {
-    shell_->ConnectToApplication(target_url_, services.Pass(),
-                                  exposed_services.Pass());
+                        ServiceProviderPtr exposed_services,
+                        const String& url) override {
+    shell_->ConnectToApplication(url, services.Pass(), exposed_services.Pass());
   }
   void RequestQuit() override {
     RunLoop::current()->Quit();
   }
 
   Binding<Application> binding_;
-  std::string target_url_;
   ShellPtr shell_;
 };
 
 class ForwardingContentHandler : public ApplicationDelegate,
                                  public ContentHandlerFactory::ManagedDelegate {
  public:
   ForwardingContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
@@ skipping 24 matching lines @@
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new mojo::examples::ForwardingContentHandler());
   return runner.Run(shell_handle);
 }