ShellClient -> Service

mash/example/window_type_launcher/window_type_launcher.h

Index: mash/example/window_type_launcher/window_type_launcher.h
diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h
index 6afcef9631184c56071def8f33aba84a96412755..2154e3e337e079cdfb7d3dce1baab68c04635b04 100644
--- a/mash/example/window_type_launcher/window_type_launcher.h
+++ b/mash/example/window_type_launcher/window_type_launcher.h
@@ -10,7 +10,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"
 
 namespace views {
 class AuraInit;
@@ -19,7 +19,7 @@ class WindowManagerConnection;
 }
 
 class WindowTypeLauncher
-    : public shell::ShellClient,
+    : public shell::Service,
       public mash::mojom::Launchable,
       public shell::InterfaceFactory<mash::mojom::Launchable> {
  public:
@@ -29,11 +29,11 @@ class WindowTypeLauncher
   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;
 
   // mash::mojom::Launchable:
   void Launch(uint32_t what, mash::mojom::LaunchMode how) override;