ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/public/cpp/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_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
 #define MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
@@ skipping 10 matching lines @@
    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(
-        InterfaceRequest<shell::mojom::Application> application_request,
+        InterfaceRequest<shell::mojom::ShellClient> request,
         URLResponsePtr response) = 0;
   };
 
   class ManagedDelegate : public Delegate {
    public:
     ~ManagedDelegate() override {}
     // 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(
-        InterfaceRequest<shell::mojom::Application> application_request,
+        InterfaceRequest<shell::mojom::ShellClient> request,
         URLResponsePtr response) = 0;
 
    private:
-    void RunApplication(
-        InterfaceRequest<shell::mojom::Application> application_request,
-        URLResponsePtr response) override;
+    void RunApplication(InterfaceRequest<shell::mojom::ShellClient> request,
+                        URLResponsePtr response) override;
   };
 
   explicit ContentHandlerFactory(Delegate* delegate);
   ~ContentHandlerFactory() override;
 
  private:
   // From InterfaceFactory:
   void Create(Connection* connection,
               InterfaceRequest<shell::mojom::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_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_