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

examples/ui/tile/tile_view.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 "base/bind.h"
 #include "examples/ui/tile/tile_view.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/geometry/cpp/geometry_util.h"
 
 namespace examples {
 
 namespace {
 constexpr uint32_t kViewResourceIdBase = 100;
 constexpr uint32_t kViewResourceIdSpacing = 100;
 
 constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId;
 constexpr uint32_t kViewNodeIdBase = 100;
 constexpr uint32_t kViewNodeIdSpacing = 100;
 constexpr uint32_t kViewSceneNodeIdOffset = 1;
 constexpr uint32_t kViewFallbackColorNodeIdOffset = 2;
 constexpr uint32_t kViewFallbackDimLayerNodeIdOffset = 3;
 constexpr uint32_t kViewFallbackDimSceneNodeIdOffset = 4;
 }  // namespace
 
 TileParams::TileParams() {}
 
 TileParams::~TileParams() {}
 
 TileView::TileView(
-    mojo::ApplicationImpl* app_impl,
+    mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
     mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
     const TileParams& params)
-    : BaseView(app_impl, view_owner_request.Pass(), "Tile"), params_(params) {
+    : BaseView(app_connector.Pass(), view_owner_request.Pass(), "Tile"),
+      params_(params) {
   ConnectViews();
 }
 
 TileView::~TileView() {}
 
 void TileView::ConnectViews() {
   uint32_t child_key = 0;
   for (const auto& url : params_.view_urls) {
     // Start connecting to the view provider.
     mojo::ui::ViewProviderPtr provider;
-    mojo::ConnectToService(app_impl()->shell(), url, mojo::GetProxy(&provider));
+    mojo::ConnectToService(app_connector(), url, mojo::GetProxy(&provider));
 
     LOG(INFO) << "Connecting to view: child_key=" << child_key
               << ", url=" << url;
     mojo::ui::ViewOwnerPtr child_view_owner;
     provider->CreateView(mojo::GetProxy(&child_view_owner), nullptr, nullptr);
 
     GetViewContainer()->AddChild(child_key, child_view_owner.Pass());
     views_.emplace(std::make_pair(
         child_key, std::unique_ptr<ViewData>(new ViewData(url, child_key))));
 
@@ skipping 198 matching lines @@
   metadata->version = scene_version();
   scene()->Publish(metadata.Pass());
 }
 
 TileView::ViewData::ViewData(const std::string& url, uint32_t key)
     : url(url), key(key) {}
 
 TileView::ViewData::~ViewData() {}
 
 }  // namespace examples