Make Service own ServiceContext.

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/common/material_design/material_design_controller.h"
 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
@@ skipping 47 matching lines @@
   chromeos::CrasAudioHandler::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
   message_center::MessageCenter::Shutdown();
 }
 
 }  // namespace
 
 WindowManagerApplication::WindowManagerApplication()
-    : connector_(nullptr), screenlock_state_listener_binding_(this) {}
+    : screenlock_state_listener_binding_(this) {}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
   // it early on.
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars(
       accelerator_registrars_);
   for (AcceleratorRegistrarImpl* registrar : accelerator_registrars)
     registrar->Destroy();
 
   // Destroy the WindowManager while still valid. This way we ensure
   // OnWillDestroyRootWindowController() is called (if it hasn't been already).
   window_manager_.reset();
 
   ShutdownComponents();
 }
 
 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::InitWindowManager(
     ::ui::WindowTreeClient* window_tree_client) {
   InitializeComponents();
 
   window_manager_->Init(window_tree_client);
   window_manager_->AddObserver(this);
 }
 
-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_));
+void WindowManagerApplication::OnStart(const shell::Identity& identity) {
+  ::ui::GpuService::Initialize(connector());
+  window_manager_.reset(new WindowManager(connector()));
 
-  aura_init_.reset(new views::AuraInit(connector_, "ash_mus_resources.pak"));
+  aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak"));
   MaterialDesignController::Initialize();
 
-  tracing_.Initialize(connector, identity.name());
+  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);
+  window_tree_client->ConnectAsWindowManager(connector());
 
   InitWindowManager(window_tree_client);
 }
 
 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_);
@@ skipping 78 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