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

examples/ui/png_viewer/png_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 <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/content_viewer_app.h"
 #include "mojo/ui/ganesh_view.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace examples {
 
 namespace {
 constexpr uint32_t kContentImageResourceId = 1;
 constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId;
 }  // namespace
 
 class PNGView : public mojo::ui::GaneshView {
  public:
-  PNGView(mojo::ApplicationImpl* app_impl,
+  PNGView(mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
           mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
           const skia::RefPtr<SkImage>& image)
-      : GaneshView(app_impl, view_owner_request.Pass(), "PNGViewer"),
+      : GaneshView(app_connector.Pass(),
+                   view_owner_request.Pass(),
+                   "PNGViewer"),
         image_(image) {
     DCHECK(image_);
   }
 
   ~PNGView() override {}
 
  private:
   // |GaneshView|:
   void OnPropertiesChanged(
       uint32_t old_scene_version,
@@ skipping 68 matching lines @@
     DCHECK(image_);
   }
 
   ~PNGContentViewProviderApp() 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 PNGView(app_impl(), view_owner_request.Pass(), image_);
+    new PNGView(mojo::CreateApplicationConnector(app_impl()->shell()),
+                view_owner_request.Pass(), image_);
   }
 
  private:
   skia::RefPtr<SkImage> image_;
 
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewProviderApp);
 };
 
 class PNGContentViewerApp : public mojo::ui::ContentViewerApp {
  public:
@@ skipping 22 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewerApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::PNGContentViewerApp());
   return runner.Run(application_request);
 }