ShellClient -> Service

ash/mus/window_manager_application.cc

 // 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.
 
 #include "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mus/accelerator_registrar_impl.h"
 #include "ash/mus/root_window_controller.h"
@@ skipping 35 matching lines @@
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::InitWindowManager(
     ::ui::WindowTreeClient* window_tree_client) {
   window_manager_->Init(window_tree_client);
   window_manager_->AddObserver(this);
 }
 
-void WindowManagerApplication::Initialize(shell::Connector* connector,
-                                          const shell::Identity& identity,
-                                          uint32_t id) {
+void WindowManagerApplication::OnStart(shell::Connector* connector,
+                                       const shell::Identity& identity,
+                                       uint32_t id) {
   connector_ = connector;
   ::ui::GpuService::Initialize(connector);
   window_manager_.reset(new WindowManager(connector_));
 
   aura_init_.reset(new views::AuraInit(connector_, "ash_mus_resources.pak"));
 
   tracing_.Initialize(connector, identity.name());
 
   ::ui::WindowTreeClient* window_tree_client = new ::ui::WindowTreeClient(
       window_manager_.get(), window_manager_.get(), nullptr);
   window_tree_client->ConnectAsWindowManager(connector);
 
   InitWindowManager(window_tree_client);
 }
 
-bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
+bool WindowManagerApplication::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::ShelfLayout>(this);
   connection->AddInterface<mojom::UserWindowController>(this);
   connection->AddInterface<::ui::mojom::AcceleratorRegistrar>(this);
   if (connection->GetRemoteIdentity().name() == "mojo:mash_session") {
     connection->GetInterface(&session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }
   return true;
 }
@@ skipping 75 matching lines @@
     RootWindowController* controller) {
   // TODO(msw): this isn't right, ownership should belong in WindowManager
   // and/or RootWindowController. But this is temporary until we get rid of
   // sysui.
   shelf_layout_.reset();
   user_window_controller_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash