Make Service own ServiceContext.

ash/touch_hud/mus/touch_hud_application.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 "ash/touch_hud/mus/touch_hud_application.h"
 
 #include "ash/public/interfaces/container.mojom.h"
 #include "ash/touch_hud/touch_hud_renderer.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 42 matching lines @@
 
   views::WindowManagerConnection* window_manager_connection_;
   TouchHudRenderer* touch_hud_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudUI);
 };
 
 TouchHudApplication::TouchHudApplication() : binding_(this) {}
 TouchHudApplication::~TouchHudApplication() {}
 
-void TouchHudApplication::OnStart(shell::Connector* connector,
-                                  const shell::Identity& identity,
-                                  uint32_t id) {
-  connector_ = connector;
-  aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+void TouchHudApplication::OnStart(const shell::Identity& identity) {
+  aura_init_.reset(new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector, identity);
+      views::WindowManagerConnection::Create(connector(), identity);
 }
 
 bool TouchHudApplication::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mash::mojom::Launchable>(this);
   return true;
 }
 
 void TouchHudApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) {
   if (!widget_) {
     widget_ = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
     params.accept_events = false;
     params.delegate = new TouchHudUI(window_manager_connection_.get(), widget_);
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[ash::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(ash::mojom::Container::OVERLAY));
     properties[ui::mojom::WindowManager::kShowState_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
     ui::Window* window =
         window_manager_connection_.get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
-        widget_, connector_, window, ui::mojom::SurfaceType::DEFAULT);
+        widget_, connector(), window, ui::mojom::SurfaceType::DEFAULT);
     widget_->Init(params);
     widget_->Show();
   } else {
     widget_->Close();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 }
 
 void TouchHudApplication::Create(const shell::Identity& remote_identity,
                                  mash::mojom::LaunchableRequest request) {
   binding_.Bind(std::move(request));
 }
 
 }  // namespace touch_hud
 }  // namespace ash