Rename ApplicationDelegate to ShellClient

mash/shell/shell_application_delegate.h

Index: mash/shell/shell_application_delegate.h
diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h
index a36a91a7ed6d6f698fa6fcae550b52f8e57af1d7..dc812828c0690c16e8a0ab48867c1131a298cd8f 100644
--- a/mash/shell/shell_application_delegate.h
+++ b/mash/shell/shell_application_delegate.h
@@ -13,18 +13,18 @@
 #include "mash/shell/public/interfaces/shell.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/common/weak_interface_ptr_set.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 
 namespace mojo {
-class ApplicationConnection;
+class Connection;
 }
 
 namespace mash {
 namespace shell {
 
 class ShellApplicationDelegate
-    : public mojo::ApplicationDelegate,
+    : public mojo::ShellClient,
       public mash::shell::mojom::Shell,
       public mojo::InterfaceFactory<mash::shell::mojom::Shell> {
  public:
@@ -32,11 +32,10 @@ class ShellApplicationDelegate
   ~ShellApplicationDelegate() override;
 
  private:
-  // mojo::ApplicationDelegate:
+  // mojo::ShellClient:
   void Initialize(mojo::Shell* shell, const std::string& url,
                   uint32_t id) override;
-  bool AcceptConnection(
-      mojo::ApplicationConnection* connection) override;
+  bool AcceptConnection(mojo::Connection* connection) override;
 
   // mash::shell::mojom::Shell:
   void AddScreenlockStateListener(
@@ -45,7 +44,7 @@ class ShellApplicationDelegate
   void UnlockScreen() override;
 
   // mojo::InterfaceFactory<mash::shell::mojom::Shell>:
-  void Create(mojo::ApplicationConnection* connection,
+  void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<mash::shell::mojom::Shell> r) override;
 
   void StartWindowManager();
@@ -63,7 +62,7 @@ class ShellApplicationDelegate
                                const base::Closure& restart_callback);
 
   mojo::Shell* shell_;
-  std::map<std::string, scoped_ptr<mojo::ApplicationConnection>> connections_;
+  std::map<std::string, scoped_ptr<mojo::Connection>> connections_;
   bool screen_locked_;
   mojo::WeakBindingSet<mash::shell::mojom::Shell> bindings_;
   mojo::WeakInterfacePtrSet<mojom::ScreenlockStateListener>