ShellClient -> Service

mash/catalog_viewer/catalog_viewer.cc

Index: mash/catalog_viewer/catalog_viewer.cc
diff --git a/mash/catalog_viewer/catalog_viewer.cc b/mash/catalog_viewer/catalog_viewer.cc
index 0aa4a241fa477e579a2d1354207957f586a8b4c9..7efe196225b9339ca6d33aadef16035b4f080ef3 100644
--- a/mash/catalog_viewer/catalog_viewer.cc
+++ b/mash/catalog_viewer/catalog_viewer.cc
@@ -175,9 +175,9 @@ void CatalogViewer::RemoveWindow(views::Widget* window) {
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void CatalogViewer::Initialize(shell::Connector* connector,
-                               const shell::Identity& identity,
-                               uint32_t id) {
+void CatalogViewer::OnStart(shell::Connector* connector,
+                            const shell::Identity& identity,
+                            uint32_t id) {
   connector_ = connector;
   tracing_.Initialize(connector, identity.name());
 
@@ -186,7 +186,7 @@ void CatalogViewer::Initialize(shell::Connector* connector,
       views::WindowManagerConnection::Create(connector, identity);
 }
 
-bool CatalogViewer::AcceptConnection(shell::Connection* connection) {
+bool CatalogViewer::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::Launchable>(this);
   return true;
 }