ShellClient -> Service

mash/catalog_viewer/catalog_viewer.h

Index: mash/catalog_viewer/catalog_viewer.h
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h
index 9f393f096d782db4962ee48e8c570820d3835c0b..b5412cd89c55b5499e734dd4ef6ca99b33a79e46 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/catalog_viewer/catalog_viewer.h
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace views {
@@ -24,7 +24,7 @@ class WindowManagerConnection;
 namespace mash {
 namespace catalog_viewer {
 
-class CatalogViewer : public shell::ShellClient,
+class CatalogViewer : public shell::Service,
                       public mojom::Launchable,
                       public shell::InterfaceFactory<mojom::Launchable> {
  public:
@@ -34,11 +34,11 @@ class CatalogViewer : public shell::ShellClient,
   void RemoveWindow(views::Widget* window);
 
  private:
-  // 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;
 
   // mojom::Launchable:
   void Launch(uint32_t what, mojom::LaunchMode how) override;