ShellClient -> Service

ash/mus/window_manager_application.h

 // Copyright 2015 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.
 
 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
 #include "ash/mus/window_manager_observer.h"
 #include "ash/public/interfaces/shelf_layout.mojom.h"
 #include "ash/public/interfaces/user_window_controller.mojom.h"
 #include "base/macros.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mojo/public/cpp/bindings/binding.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"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
 
 namespace views {
 class AuraInit;
 }
 
 namespace ui {
 class Event;
 class WindowTreeClient;
 }
 
 namespace ash {
 namespace mus {
 
 class AcceleratorRegistrarImpl;
 class RootWindowController;
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
 class WindowManager;
 
 class WindowManagerApplication
-    : public shell::ShellClient,
+    : public shell::Service,
       public shell::InterfaceFactory<mojom::ShelfLayout>,
       public shell::InterfaceFactory<mojom::UserWindowController>,
       public shell::InterfaceFactory<::ui::mojom::AcceleratorRegistrar>,
       public mash::session::mojom::ScreenlockStateListener,
       public WindowManagerObserver {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   shell::Connector* connector() { return connector_; }
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
   mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   void InitWindowManager(::ui::WindowTreeClient* window_tree_client);
 
-  // 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;
 
   // shell::InterfaceFactory<mojom::ShelfLayout>:
   void Create(shell::Connection* connection,
               mojo::InterfaceRequest<mojom::ShelfLayout> request) override;
 
   // shell::InterfaceFactory<mojom::UserWindowController>:
   void Create(
       shell::Connection* connection,
       mojo::InterfaceRequest<mojom::UserWindowController> request) override;
 
@@ skipping 40 matching lines @@
   mojo::Binding<mash::session::mojom::ScreenlockStateListener>
       screenlock_state_listener_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_