ShellClient -> Service

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"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.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/gpu_service.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 129 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::Initialize(shell::Connector* connector,
-                                        const shell::Identity& identity,
-                                        uint32_t id) {
+void QuickLaunchApplication::OnStart(shell::Connector* connector,
+                                     const shell::Identity& identity,
+                                     uint32_t id) {
   connector_ = connector;
   ui::GpuService::Initialize(connector);
   tracing_.Initialize(connector, identity.name());
 
   aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
   window_manager_connection_ =
       views::WindowManagerConnection::Create(connector, identity);
 
   Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
 }
 
-bool QuickLaunchApplication::AcceptConnection(shell::Connection* connection) {
+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);
 
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
       new QuickLaunchUI(this, connector_, std::move(catalog)), nullptr,
       gfx::Rect(10, 640, 0, 0));
   window->Show();
   windows_.push_back(window);
 }
 
 void QuickLaunchApplication::Create(shell::Connection* connection,
                                     mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace quick_launch
 }  // namespace mash