Rename ApplicationDelegate to ShellClient

mojo/shell/public/cpp/application_impl.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_APPLICATION_IMPL_H_
 #define MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/public/cpp/app_lifetime_helper.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/lib/service_registry.h"
 #include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/application.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
 // TODO(beng): This comment is hilariously out of date.
 // Utility class for communicating with the Shell, and providing Services
 // to clients.
 //
 // To use define a class that implements your specific server api, e.g. FooImpl
@@ skipping 38 matching lines @@
         shell::mojom::ShellPtr* shell) {
       application_->UnbindConnections(application_request, shell);
     }
 
    private:
     ApplicationImpl* application_;
   };
 
   // Does not take ownership of |delegate|, which must remain valid for the
   // lifetime of ApplicationImpl.
-  ApplicationImpl(ApplicationDelegate* delegate,
+  ApplicationImpl(ShellClient* client,
                   InterfaceRequest<shell::mojom::Application> request);
   // Constructs an ApplicationImpl with a custom termination closure. This
   // closure is invoked on Quit() instead of the default behavior of quitting
   // the current base::MessageLoop.
-  ApplicationImpl(ApplicationDelegate* delegate,
+  ApplicationImpl(ShellClient* client,
                   InterfaceRequest<shell::mojom::Application> request,
                   const Closure& termination_closure);
   ~ApplicationImpl() override;
 
   // The Mojo shell. This will return a valid pointer after Initialize() has
   // been invoked. It will remain valid until UnbindConnections() is invoked or
   // the ApplicationImpl is destroyed.
   shell::mojom::Shell* shell() const { return shell_.get(); }
 
   // Block the calling thread until the Initialize() method is called by the
   // shell.
   void WaitForInitialize();
 
   // Shell.
-  scoped_ptr<ApplicationConnection> ConnectToApplication(
-      const std::string& url) override;
-  scoped_ptr<ApplicationConnection> ConnectToApplication(
-      ConnectParams* params) override;
+  scoped_ptr<Connection> ConnectToApplication(const std::string& url) override;
+  scoped_ptr<Connection> ConnectToApplication(ConnectParams* params) override;
   void Quit() override;
   scoped_ptr<AppRefCount> CreateAppRefCount() override;
 
  private:
   // shell::mojom::Application implementation.
   void Initialize(shell::mojom::ShellPtr shell,
                   const mojo::String& url,
                   uint32_t id) override;
   void AcceptConnection(const String& requestor_url,
                         uint32_t requestor_id,
@@ skipping 11 matching lines @@
 
   // Unbinds the Shell and Application connections. Can be used to re-bind the
   // handles to another implementation of ApplicationImpl, for instance when
   // running apptests.
   void UnbindConnections(
       InterfaceRequest<shell::mojom::Application>* application_request,
       shell::mojom::ShellPtr* shell);
 
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
-  ScopedVector<ApplicationConnection> incoming_connections_;
-  ApplicationDelegate* delegate_;
+  ScopedVector<Connection> incoming_connections_;
+  ShellClient* client_;
   Binding<shell::mojom::Application> binding_;
   shell::mojom::ShellPtr shell_;
   Closure termination_closure_;
   AppLifetimeHelper app_lifetime_helper_;
   bool quit_requested_;
   base::WeakPtrFactory<ApplicationImpl> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_