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

mojo/shell/public/cpp/content_handler_factory.h

Index: mojo/shell/public/cpp/content_handler_factory.h
diff --git a/mojo/shell/public/cpp/content_handler_factory.h b/mojo/shell/public/cpp/content_handler_factory.h
index a174cdd73ecac129d20558ee51c5ad08b4d9361e..9e3c5fff685bcd692e7926fd26d3f57ddc1e4533 100644
--- a/mojo/shell/public/cpp/content_handler_factory.h
+++ b/mojo/shell/public/cpp/content_handler_factory.h
@@ -28,7 +28,7 @@ class ContentHandlerFactory
     // 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;
   };
 
@@ -40,13 +40,12 @@ class ContentHandlerFactory
     // 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);