Make Service own ServiceContext.

mash/quick_launch/quick_launch_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 "mash/quick_launch/quick_launch_application.h"
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 20 matching lines @@
 namespace mash {
 namespace quick_launch {
 
 class QuickLaunchUI : public views::WidgetDelegateView,
                       public views::TextfieldController {
  public:
   QuickLaunchUI(QuickLaunchApplication* quick_launch,
                 shell::Connector* connector,
                 catalog::mojom::CatalogPtr catalog)
       : quick_launch_(quick_launch),
-        connector_(connector),
+    connector_(connector),
         prompt_(new views::Textfield),
         catalog_(std::move(catalog)) {
     set_background(views::Background::CreateStandardPanelBackground());
     prompt_->set_controller(this);
     AddChildView(prompt_);
 
     UpdateEntries();
   }
   ~QuickLaunchUI() override {
     quick_launch_->RemoveWindow(GetWidget());
@@ skipping 104 matching lines @@
 QuickLaunchApplication::~QuickLaunchApplication() {}
 
 void QuickLaunchApplication::RemoveWindow(views::Widget* window) {
   auto it = std::find(windows_.begin(), windows_.end(), window);
   DCHECK(it != windows_.end());
   windows_.erase(it);
   if (windows_.empty() && base::MessageLoop::current()->is_running())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void QuickLaunchApplication::OnStart(shell::Connector* connector,
-                                     const shell::Identity& identity,
-                                     uint32_t id) {
-  connector_ = connector;
-  tracing_.Initialize(connector, identity.name());
+void QuickLaunchApplication::OnStart(const shell::Identity& identity) {
+  tracing_.Initialize(connector(), identity.name());
 
-  aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+  aura_init_.reset(
+      new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector, identity);
+      views::WindowManagerConnection::Create(connector(), identity);
 
   Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
 }
 
 bool QuickLaunchApplication::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::Launchable>(this);
   return true;
 }
 
 void QuickLaunchApplication::Launch(uint32_t what, mojom::LaunchMode how) {
   bool reuse = how == mojom::LaunchMode::REUSE ||
                how == mojom::LaunchMode::DEFAULT;
   if (reuse && !windows_.empty()) {
     windows_.back()->Activate();
     return;
   }
   catalog::mojom::CatalogPtr catalog;
-  connector_->ConnectToInterface("mojo:catalog", &catalog);
+  connector()->ConnectToInterface("mojo:catalog", &catalog);
 
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
-      new QuickLaunchUI(this, connector_, std::move(catalog)), nullptr,
-      gfx::Rect(10, 640, 0, 0));
+      new QuickLaunchUI(this, connector(), std::move(catalog)),
+      nullptr, gfx::Rect(10, 640, 0, 0));
   window->Show();
   windows_.push_back(window);
 }
 
 void QuickLaunchApplication::Create(const shell::Identity& remote_identity,
                                     mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace quick_launch
 }  // namespace mash