Rename ApplicationDelegate to ShellClient

mash/wm/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 "mash/wm/window_manager_application.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "mash/wm/accelerator_registrar_impl.h"
 #include "mash/wm/root_window_controller.h"
 #include "mash/wm/root_windows_observer.h"
 #include "mash/wm/user_window_controller_impl.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
 
 namespace mash {
 namespace wm {
 
 WindowManagerApplication::WindowManagerApplication()
     : shell_(nullptr), window_manager_factory_binding_(this) {}
@@ skipping 84 matching lines @@
   shell_->ConnectToService("mojo:mus", &wm_factory_service);
   wm_factory_service->SetWindowManagerFactory(
       window_manager_factory_binding_.CreateInterfacePtrAndBind());
 
   user_window_controller_.reset(new UserWindowControllerImpl());
 
   root_controllers_.insert(
       RootWindowController::CreateUsingWindowTreeHost(this));
 }
 
-bool WindowManagerApplication::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+bool WindowManagerApplication::AcceptConnection(mojo::Connection* connection) {
   connection->AddService<mash::wm::mojom::UserWindowController>(this);
   connection->AddService<mus::mojom::AcceleratorRegistrar>(this);
   return true;
 }
 
 void WindowManagerApplication::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> request) {
   if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
     user_window_controller_binding_.AddBinding(user_window_controller_.get(),
                                                std::move(request));
   } else {
     user_window_controller_requests_.push_back(make_scoped_ptr(
         new mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) {
   static int accelerator_registrar_count = 0;
   if (accelerator_registrar_count == std::numeric_limits<int>::max()) {
     // Restart from zero if we have reached the limit. It is technically
     // possible to end up with multiple active registrars with the same
     // namespace, but it is highly unlikely. In the event that multiple
     // registrars have the same namespace, this new registrar will be unable to
     // install accelerators.
     accelerator_registrar_count = 0;
   }
   accelerator_registrars_.insert(new AcceleratorRegistrarImpl(
       this, ++accelerator_registrar_count, std::move(request),
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::CreateWindowManager(
     mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
   root_controllers_.insert(RootWindowController::CreateFromDisplay(
       this, std::move(display), std::move(client_request)));
 }
 
 }  // namespace wm
 }  // namespace mash