Remove Client relationship between mojo.Shell/mojo.Application

examples/content_handler_demo/content_handler_demo.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 <stdio.h>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
 
-class PrintBodyApplication : public InterfaceImpl<Application> {
+class PrintBodyApplication : public Application {
  public:
-  PrintBodyApplication(ShellPtr shell, ScopedDataPipeConsumerHandle body)
-      : shell_(shell.Pass()), body_(body.Pass()) {
-    shell_.set_client(this);
+  PrintBodyApplication(InterfaceRequest<Application> request,
+                       ScopedDataPipeConsumerHandle body)
+      : binding_(this, request.Pass()), body_(body.Pass()) {}
+
+  virtual void Initialize(ShellPtr shell, Array<String> args) override {
+    shell_ = shell.Pass();
   }
-
-  virtual void Initialize(Array<String> args) override {}
   virtual void RequestQuit() override {}
 
   virtual void AcceptConnection(const String& requestor_url,
                                 InterfaceRequest<ServiceProvider> services,
                                 ServiceProviderPtr exported_services) override {
     printf("ContentHandler::OnConnect - requestor_url:%s - body follows\n\n",
            requestor_url.To<std::string>().c_str());
     PrintResponse(body_.Pass());
     delete this;
   }
@@ skipping 16 matching lines @@
           break;
         }
       } else {
         break;
       }
 
       printf("\n>>> EOF <<<\n");
     }
   }
 
+  StrongBinding<Application> binding_;
   ShellPtr shell_;
   ScopedDataPipeConsumerHandle body_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(PrintBodyApplication);
 };
 
 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
  public:
   explicit ContentHandlerImpl() {}
   virtual ~ContentHandlerImpl() {}
 
  private:
-  virtual void StartApplication(ShellPtr shell,
+  virtual void StartApplication(InterfaceRequest<Application> application,
                                 URLResponsePtr response) override {
     // The application will delete itself after being connected to.
-    new PrintBodyApplication(shell.Pass(), response->body.Pass());
+    new PrintBodyApplication(application.Pass(), response->body.Pass());
   }
 };
 
 class ContentHandlerApp : public ApplicationDelegate {
  public:
   ContentHandlerApp() : content_handler_factory_() {}
 
   virtual void Initialize(ApplicationImpl* app) override {}
 
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
     connection->AddService(&content_handler_factory_);
     return true;
   }
 
  private:
   InterfaceFactoryImpl<ContentHandlerImpl> content_handler_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ContentHandlerApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mojo::examples::ContentHandlerApp);
   return runner.Run(shell_handle);
 }