Rename ApplicationDelegate to ShellClient.

ApplicationConnection -> Connection

TBR=rockot@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1675083002

Cr-Commit-Position: refs/heads/master@{#374054}

5 files changed, 13 insertions, 13 deletions

diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc
index 29a7484..a340644 100644
--- a/device/devices_app/devices_app.cc
+++ b/device/devices_app/devices_app.cc
@@ -18,7 +18,7 @@
 #include "device/devices_app/usb/device_manager_impl.h"
 #include "device/usb/usb_service.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 #include "url/gurl.h"
 
@@ -88,7 +88,7 @@ void DevicesApp::Initialize(mojo::Shell* shell,
   StartIdleTimer();
 }
 
-bool DevicesApp::AcceptConnection(mojo::ApplicationConnection* connection) {
+bool DevicesApp::AcceptConnection(mojo::Connection* connection) {
   connection->AddService<usb::DeviceManager>(this);
   return true;
 }
@@ -98,7 +98,7 @@ void DevicesApp::Quit() {
   shell_ = nullptr;
 }
 
-void DevicesApp::Create(mojo::ApplicationConnection* connection,
+void DevicesApp::Create(mojo::Connection* connection,
                         mojo::InterfaceRequest<usb::DeviceManager> request) {
   // Bind the new device manager to the connecting application's permission
   // provider.
diff --git a/device/devices_app/devices_app.h b/device/devices_app/devices_app.h
index d247702..0fecb42 100644
--- a/device/devices_app/devices_app.h
+++ b/device/devices_app/devices_app.h
@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.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 Shell;
@@ -24,7 +24,7 @@ namespace usb {
 class DeviceManager;
 }
 
-class DevicesApp : public mojo::ApplicationDelegate,
+class DevicesApp : public mojo::ShellClient,
                    public mojo::InterfaceFactory<usb::DeviceManager> {
  public:
   DevicesApp();
@@ -33,15 +33,15 @@ class DevicesApp : public mojo::ApplicationDelegate,
  private:
   class USBServiceInitializer;
 
-  // 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;
   void Quit() override;
 
   // mojo::InterfaceFactory<usb::DeviceManager>:
-  void Create(mojo::ApplicationConnection* connection,
+  void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<usb::DeviceManager> request) override;
 
   // Mojo error handler to track device manager count.
diff --git a/device/devices_app/main.cc b/device/devices_app/main.cc
index a43d8ff..1694aac 100644
--- a/device/devices_app/main.cc
+++ b/device/devices_app/main.cc
@@ -5,8 +5,8 @@
 #include "base/sequenced_task_runner.h"
 #include "device/devices_app/public/cpp/devices_app_factory.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/device/devices_app/public/cpp/devices_app_factory.cc b/device/devices_app/public/cpp/devices_app_factory.cc
index a6ffe4e..154f67c 100644
--- a/device/devices_app/public/cpp/devices_app_factory.cc
+++ b/device/devices_app/public/cpp/devices_app_factory.cc
@@ -9,8 +9,8 @@
 namespace device {
 
 // static
-scoped_ptr<mojo::ApplicationDelegate> DevicesAppFactory::CreateApp() {
-  return scoped_ptr<mojo::ApplicationDelegate>(new DevicesApp());
+scoped_ptr<mojo::ShellClient> DevicesAppFactory::CreateApp() {
+  return scoped_ptr<mojo::ShellClient>(new DevicesApp());
 }
 
 }  // namespace device
diff --git a/device/devices_app/public/cpp/devices_app_factory.h b/device/devices_app/public/cpp/devices_app_factory.h
index ba03185..6ba7447 100644
--- a/device/devices_app/public/cpp/devices_app_factory.h
+++ b/device/devices_app/public/cpp/devices_app_factory.h
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 
 namespace mojo {
-class ApplicationDelegate;
+class ShellClient;
 }
 
 namespace device {
@@ -20,7 +20,7 @@ class DevicesAppFactory {
   // Creates a DevicesApp delegate which can be used to launch a new instance
   // of the devices app on a mojo application runner. The caller owns the
   // delegate.
-  static scoped_ptr<mojo::ApplicationDelegate> CreateApp();
+  static scoped_ptr<mojo::ShellClient> CreateApp();
 };
 
 }  // namespace device