ShellClient -> Service

services/ui/service.h

Index: services/ui/service.h
diff --git a/services/ui/service.h b/services/ui/service.h
index 056ed97aa5e96970f8f49d891aa6541e527600a3..48c11efef134fa4350c08bae606a8c4829e8bfbd 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -16,7 +16,7 @@
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "services/ui/input_devices/input_device_server.h"
 #include "services/ui/public/interfaces/clipboard.mojom.h"
@@ -58,7 +58,7 @@ class WindowServer;
 }
 
 class Service
-    : public shell::ShellClient,
+    : public shell::Service,
       public ws::WindowServerDelegate,
       public shell::InterfaceFactory<mojom::Clipboard>,
       public shell::InterfaceFactory<mojom::DisplayManager>,
@@ -92,11 +92,11 @@ class Service
 
   void AddUserIfNecessary(shell::Connection* connection);
 
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t id) override;
-  bool AcceptConnection(shell::Connection* connection) override;
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t id) override;
+  bool OnConnect(shell::Connection* connection) override;
 
   // WindowServerDelegate:
   void OnFirstDisplayReady() override;