Remove Client relationship between mojo.Shell/mojo.Application

mojo/application/content_handler_factory.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 MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_
 #define MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 
 namespace mojo {
 
 class ContentHandlerFactory : public InterfaceFactory<ContentHandler> {
  public:
   class HandledApplicationHolder {
    public:
     virtual ~HandledApplicationHolder() {}
   };
 
   class Delegate {
    public:
     virtual ~Delegate() {}
     // Implement this method to create the Application. This method will be
     // called on a new thread. Leaving this method will quit the application.
-    virtual void RunApplication(ShellPtr shell, URLResponsePtr response) = 0;
+    virtual void RunApplication(
+        InterfaceRequest<Application> application_request,
+        URLResponsePtr response) = 0;
   };
 
   class ManagedDelegate : public Delegate {
    public:
     virtual ~ManagedDelegate() {}
     // Implement this method to create the Application for the given content.
     // This method will be called on a new thread. The application will be run
     // on this new thread, and the returned value will be kept alive until the
     // application ends.
     virtual scoped_ptr<HandledApplicationHolder> CreateApplication(
-        ShellPtr shell,
+        InterfaceRequest<Application> application_request,
         URLResponsePtr response) = 0;
 
    private:
-    void RunApplication(ShellPtr shell, URLResponsePtr response) override;
+    void RunApplication(InterfaceRequest<Application> application_request,
+                        URLResponsePtr response) override;
   };
 
   explicit ContentHandlerFactory(Delegate* delegate);
   virtual ~ContentHandlerFactory();
 
  private:
   // From InterfaceFactory:
   void Create(ApplicationConnection* connection,
               InterfaceRequest<ContentHandler> request) override;
 
@@ skipping 14 matching lines @@
 
 template <class A>
 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
 make_handled_factory_holder(A* value) {
   return make_scoped_ptr(new HandledApplicationHolderImpl<A>(value));
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_