Reify view ownership as a message pipe.

services/ui/launcher/launcher_app.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 "services/ui/launcher/launcher_app.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
 #include "services/ui/launcher/launcher_view_tree.h"
 
 namespace launcher {
 
 LauncherApp::LauncherApp()
     : app_impl_(nullptr), viewport_event_dispatcher_binding_(this) {}
 
 LauncherApp::~LauncherApp() {}
 
 void LauncherApp::Initialize(mojo::ApplicationImpl* app_impl) {
@@ skipping 65 matching lines @@
 void LauncherApp::OnViewportCreated(mojo::ViewportMetricsPtr metrics) {
   viewport_->Show();
 
   mojo::ContextProviderPtr context_provider;
   viewport_->GetContextProvider(GetProxy(&context_provider));
 
   view_tree_.reset(new LauncherViewTree(
       compositor_.get(), view_manager_.get(), context_provider.Pass(),
       metrics.Pass(),
       base::Bind(&LauncherApp::Shutdown, base::Unretained(this))));
-  UpdateClientView();
+  view_tree_->SetRoot(client_view_owner_.Pass());
+
   RequestUpdatedViewportMetrics();
 }
 
 void LauncherApp::OnViewportMetricsChanged(mojo::ViewportMetricsPtr metrics) {
   if (view_tree_) {
     view_tree_->SetViewportMetrics(metrics.Pass());
     RequestUpdatedViewportMetrics();
   }
 }
 
 void LauncherApp::RequestUpdatedViewportMetrics() {
   viewport_->RequestMetrics(base::Bind(&LauncherApp::OnViewportMetricsChanged,
                                        base::Unretained(this)));
 }
 
 void LauncherApp::OnEvent(mojo::EventPtr event,
                           const mojo::Callback<void()>& callback) {
   if (view_tree_)
     view_tree_->DispatchEvent(event.Pass());
   callback.Run();
 }
 
 void LauncherApp::LaunchClient(std::string app_url) {
   DVLOG(1) << "Launching " << app_url;
 
-  app_impl_->ConnectToService(app_url, &client_view_provider_);
-  client_view_provider_.set_connection_error_handler(base::Bind(
-      &LauncherApp::OnClientConnectionError, base::Unretained(this)));
+  mojo::ui::ViewProviderPtr client_view_provider;
+  app_impl_->ConnectToService(app_url, &client_view_provider);
 
-  client_view_provider_->CreateView(
-      nullptr, nullptr,
-      base::Bind(&LauncherApp::OnClientViewCreated, base::Unretained(this)));
-}
-
-void LauncherApp::OnClientConnectionError() {
-  LOG(ERROR) << "Exiting due to client application connection error.";
-  Shutdown();
-}
-
-void LauncherApp::OnClientViewCreated(mojo::ui::ViewTokenPtr view_token) {
-  client_view_token_ = view_token.Pass();
-  UpdateClientView();
-}
-
-void LauncherApp::UpdateClientView() {
-  if (view_tree_)
-    view_tree_->SetRoot(client_view_token_.Clone());
+  client_view_provider->CreateView(mojo::GetProxy(&client_view_owner_), nullptr,
+                                   nullptr);
 }
 
 void LauncherApp::Shutdown() {
   app_impl_->Terminate();
 }
 
 }  // namespace launcher