Rename ApplicationDelegate to ShellClient

components/html_viewer/html_document.cc

 // Copyright 2014 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 "components/html_viewer/html_document.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 #include "components/html_viewer/html_frame.h"
 #include "components/html_viewer/html_frame_tree_manager.h"
 #include "components/html_viewer/test_html_viewer_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/ws/ids.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/shell/public/cpp/application_impl.h"
-#include "mojo/shell/public/cpp/connect.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/size.h"
 
 using mojo::AxProvider;
 using mus::Window;
 
 namespace html_viewer {
 namespace {
@@ skipping 46 matching lines @@
 void HTMLDocument::TransferableState::Move(TransferableState* other) {
   owns_window_tree_connection = other->owns_window_tree_connection;
   root = other->root;
   window_tree_delegate_impl = std::move(other->window_tree_delegate_impl);
 
   other->root = nullptr;
   other->owns_window_tree_connection = false;
 }
 
 HTMLDocument::HTMLDocument(mojo::Shell* html_document_shell,
-                           mojo::ApplicationConnection* connection,
+                           mojo::Connection* connection,
                            mojo::URLResponsePtr response,
                            GlobalState* global_state,
                            const DeleteCallback& delete_callback,
                            HTMLFactory* factory)
     : app_refcount_(html_document_shell->CreateAppRefCount()),
       html_document_shell_(html_document_shell),
       connection_(connection),
       global_state_(global_state),
       frame_(nullptr),
       delete_callback_(delete_callback),
@@ skipping 155 matching lines @@
     old_document->frame_ = nullptr;
     old_document->Destroy();
   }
 }
 
 void HTMLDocument::OnFrameDestroyed() {
   if (!transferable_state_.owns_window_tree_connection)
     delete this;
 }
 
-void HTMLDocument::Create(mojo::ApplicationConnection* connection,
+void HTMLDocument::Create(mojo::Connection* connection,
                           mojo::InterfaceRequest<AxProvider> request) {
   if (!did_finish_local_frame_load_) {
     // Cache AxProvider interface requests until the document finishes loading.
     auto cached_request = new mojo::InterfaceRequest<AxProvider>();
     *cached_request = std::move(request);
     GetBeforeLoadCache()->ax_provider_requests.insert(cached_request);
   } else {
     ax_providers_.insert(
         new AxProviderImpl(frame_->web_view(), std::move(request)));
   }
 }
 
-void HTMLDocument::Create(mojo::ApplicationConnection* connection,
+void HTMLDocument::Create(mojo::Connection* connection,
                           mojo::InterfaceRequest<TestHTMLViewer> request) {
   CHECK(IsTestInterfaceEnabled());
   if (!did_finish_local_frame_load_) {
     auto cached_request = new mojo::InterfaceRequest<TestHTMLViewer>();
     *cached_request = std::move(request);
     GetBeforeLoadCache()->test_interface_requests.insert(cached_request);
   } else {
     test_html_viewers_.push_back(new TestHTMLViewerImpl(
         frame_->web_frame()->toWebLocalFrame(), std::move(request)));
   }
 }
 
 void HTMLDocument::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<web_view::mojom::FrameClient> request) {
   if (frame_) {
     DVLOG(1) << "Request for FrameClient after one already vended.";
     return;
   }
   resource_waiter_->Bind(std::move(request));
 }
 
 void HTMLDocument::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) {
   if (frame_) {
     if (frame_->devtools_agent())
       frame_->devtools_agent()->BindToRequest(std::move(request));
   } else {
     devtools_agent_request_ = std::move(request);
   }
 }
 
 void HTMLDocument::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) {
   DCHECK(!transferable_state_.window_tree_delegate_impl);
   transferable_state_.window_tree_delegate_impl.reset(
       new WindowTreeDelegateImpl(this));
   transferable_state_.owns_window_tree_connection = true;
   mus::WindowTreeConnection::Create(
       transferable_state_.window_tree_delegate_impl.get(), std::move(request),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
 }
 
 }  // namespace html_viewer