ShellClient -> Service

mash/login/login.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "ash/public/interfaces/container.mojom.h"
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connector.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/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 95 matching lines @@
   const std::string user_id_1_;
   const std::string user_id_2_;
   views::LabelButton* login_button_1_;
   views::LabelButton* login_button_2_;
   std::unique_ptr<shell::Connection> mash_wm_connection_;
   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
-class Login : public shell::ShellClient,
+class Login : public shell::Service,
               public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
 
   void LoginAs(const std::string& user_id) {
     user_access_manager_->SetActiveUser(user_id);
     mash::init::mojom::InitPtr init;
     connector_->ConnectToInterface("mojo:mash_init", &init);
     init->StartService("mojo:mash_session", user_id);
   }
 
  private:
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t id) override {
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t id) override {
     connector_ = connector;
     identity_ = identity;
     tracing_.Initialize(connector, identity.name());
 
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
 
     connector_->ConnectToInterface("mojo:ui", &user_access_manager_);
     user_access_manager_->SetActiveUser(identity.user_id());
   }
-  bool AcceptConnection(shell::Connection* connection) override {
+  bool OnConnect(shell::Connection* connection) override {
     connection->AddInterface<mojom::Login>(this);
     return true;
   }
 
   // shell::InterfaceFactory<mojom::Login>:
   void Create(shell::Connection* connection,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
@@ skipping 20 matching lines @@
   } else if (sender == login_button_2_) {
     login_->LoginAs(user_id_2_);
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 }  // namespace
 
-shell::ShellClient* CreateLogin() {
+shell::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main