Rename ApplicationDelegate to ShellClient

mash/shell/shell_application_delegate.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/shell/shell_application_delegate.h"
 
 #include "base/bind.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 
 namespace mash {
 namespace shell {
 
 ShellApplicationDelegate::ShellApplicationDelegate()
     : shell_(nullptr), screen_locked_(false) {}
 
 ShellApplicationDelegate::~ShellApplicationDelegate() {}
 
 void ShellApplicationDelegate::Initialize(mojo::Shell* shell,
                                           const std::string& url,
                                           uint32_t id) {
   shell_ = shell;
   StartBrowserDriver();
   StartWindowManager();
   StartWallpaper();
   StartShelf();
   StartQuickLaunch();
 }
 
-bool ShellApplicationDelegate::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+bool ShellApplicationDelegate::AcceptConnection(mojo::Connection* connection) {
   connection->AddService<mash::shell::mojom::Shell>(this);
   return true;
 }
 
 void ShellApplicationDelegate::AddScreenlockStateListener(
     mojom::ScreenlockStateListenerPtr listener) {
   listener->ScreenlockStateChanged(screen_locked_);
   screenlock_listeners_.AddInterfacePtr(std::move(listener));
 }
 
@@ skipping 12 matching lines @@
     return;
   screen_locked_ = false;
   screenlock_listeners_.ForAllPtrs(
       [](mojom::ScreenlockStateListener* listener) {
         listener->ScreenlockStateChanged(false);
       });
   StopScreenlock();
 }
 
 void ShellApplicationDelegate::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<mash::shell::mojom::Shell> r) {
   bindings_.AddBinding(this, std::move(r));
 }
 
 void ShellApplicationDelegate::StartWindowManager() {
   StartRestartableService(
       "mojo:desktop_wm",
       base::Bind(&ShellApplicationDelegate::StartWindowManager,
                  base::Unretained(this)));
 }
@@ skipping 35 matching lines @@
   auto connection = connections_.find("mojo:screenlock");
   DCHECK(connections_.end() != connection);
   connections_.erase(connection);
 }
 
 void ShellApplicationDelegate::StartRestartableService(
     const std::string& url,
     const base::Closure& restart_callback) {
   // TODO(beng): This would be the place to insert logic that counted restarts
   //             to avoid infinite crash-restart loops.
-  scoped_ptr<mojo::ApplicationConnection> connection =
+  scoped_ptr<mojo::Connection> connection =
       shell_->ConnectToApplication(url);
   connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback);
   connections_[url] = std::move(connection);
 }
 
 }  // namespace shell
 }  // namespace main