ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

components/pdf_viewer/pdf_viewer.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/bitmap_uploader/bitmap_uploader.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/input_event_handler.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/input_key_codes.mojom.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_runner.h"
 #include "mojo/shell/public/cpp/interface_factory_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/pdfium/public/fpdf_ext.h"
 #include "third_party/pdfium/public/fpdfview.h"
 #include "ui/gfx/geometry/rect.h"
 #include "v8/include/v8.h"
 
 const uint32_t g_background_color = 0xFF888888;
 
 namespace pdf_viewer {
@@ skipping 191 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PDFView);
 };
 
 // Responsible for managing all the views for displaying a PDF document.
 class PDFViewerApplicationDelegate
     : public mojo::ShellClient,
       public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
  public:
   PDFViewerApplicationDelegate(
-      mojo::ApplicationRequest request,
+      mojo::ShellClientRequest request,
       mojo::URLResponsePtr response,
       const mojo::Callback<void()>& destruct_callback)
       : app_(this,
              std::move(request),
              base::Bind(&PDFViewerApplicationDelegate::OnTerminate,
                         base::Unretained(this))),
         doc_(nullptr),
         is_destroying_(false),
         destruct_callback_(destruct_callback) {
     FetchPDF(std::move(response));
@@ skipping 42 matching lines @@
     PDFView* pdf_view = new PDFView(
         &app_, connection, doc_,
         base::Bind(&PDFViewerApplicationDelegate::OnPDFViewDestroyed,
                    base::Unretained(this)));
     pdf_views_.push_back(pdf_view);
     mus::WindowTreeConnection::Create(
         pdf_view, std::move(request),
         mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
   }
 
-  mojo::ApplicationImpl app_;
+  mojo::ShellConnection app_;
   std::string data_;
   std::vector<PDFView*> pdf_views_;
   FPDF_DOCUMENT doc_;
   bool is_destroying_;
   mojo::Callback<void()> destruct_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewerApplicationDelegate);
 };
 
 class ContentHandlerImpl : public mojo::shell::mojom::ContentHandler {
  public:
   ContentHandlerImpl(
       mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request)
       : binding_(this, std::move(request)) {}
   ~ContentHandlerImpl() override {}
 
  private:
   // mojo::shell::mojom::ContentHandler:
   void StartApplication(
-      mojo::ApplicationRequest request,
+      mojo::ShellClientRequest request,
       mojo::URLResponsePtr response,
       const mojo::Callback<void()>& destruct_callback) override {
     new PDFViewerApplicationDelegate(std::move(request), std::move(response),
                                      destruct_callback);
   }
 
   mojo::StrongBinding<mojo::shell::mojom::ContentHandler> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
@@ skipping 28 matching lines @@
     new ContentHandlerImpl(std::move(request));
   }
 
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 }  // namespace
 }  // namespace pdf_viewer
 
-MojoResult MojoMain(MojoHandle application_request) {
+MojoResult MojoMain(MojoHandle request) {
   mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
-  return runner.Run(application_request);
+  return runner.Run(request);
 }