Make BaseView et al. take an ApplicationConnector instead of an ApplicationImpl.

examples/ui/pdf_viewer/pdf_viewer.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 <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/public/cpp/application/connect.h"
 #include "mojo/ui/choreographer.h"
 #include "mojo/ui/content_viewer_app.h"
 #include "mojo/ui/ganesh_view.h"
 #include "mojo/ui/input_handler.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_ext.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdfview.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
@@ skipping 85 matching lines @@
 
     return std::make_shared<PDFDocument>(shared_from_this(), doc, data);
   }
 };
 
 class PDFDocumentView : public mojo::ui::GaneshView,
                         public mojo::ui::ChoreographerDelegate,
                         public mojo::ui::InputListener {
  public:
   PDFDocumentView(
-      mojo::ApplicationImpl* app_impl,
+      mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       const std::shared_ptr<PDFDocument>& pdf_document)
-      : GaneshView(app_impl, view_owner_request.Pass(), "PDFDocumentViewer"),
+      : GaneshView(app_connector.Pass(),
+                   view_owner_request.Pass(),
+                   "PDFDocumentViewer"),
         pdf_document_(pdf_document),
         choreographer_(scene(), this),
         input_handler_(GetViewServiceProvider(), this) {
     DCHECK(pdf_document_);
   }
 
   ~PDFDocumentView() override {}
 
  private:
   // |GaneshView|:
@@ skipping 131 matching lines @@
     DCHECK(pdf_document_);
   }
 
   ~PDFContentViewProviderApp() override {}
 
   void CreateView(
       const std::string& connection_url,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
       mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override {
-    new PDFDocumentView(app_impl(), view_owner_request.Pass(), pdf_document_);
+    new PDFDocumentView(mojo::CreateApplicationConnector(app_impl()->shell()),
+                        view_owner_request.Pass(), pdf_document_);
   }
 
  private:
   std::shared_ptr<PDFLibrary> pdf_library_;
   std::shared_ptr<PDFDocument> pdf_document_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFContentViewProviderApp);
 };
 
 class PDFContentViewerApp : public mojo::ui::ContentViewerApp {
@@ skipping 20 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PDFContentViewerApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::PDFContentViewerApp());
   return runner.Run(application_request);
 }