Allow native_viewport to create new native windows on demand on Android.

shell/android/native_viewport_application_loader.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 "shell/android/native_viewport_application_loader.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/native_viewport_impl.h"
 
@@ skipping 12 matching lines @@
     const GURL& url,
     InterfaceRequest<mojo::Application> application_request) {
   DCHECK(application_request.is_pending());
   app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
 }
 
 bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService<mojo::NativeViewport>(this);
   connection->AddService<mojo::Gpu>(this);
+  connection->AddService<mojo::NativeViewportShellService>(this);
   return true;
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<mojo::NativeViewport> request) {
   if (!gpu_state_)
     gpu_state_ = new gles2::GpuState;
-  new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
+  native_viewport::NativeViewportImpl* native_viewport_impl =
+      new native_viewport::NativeViewportImpl(false, gpu_state_,
+                                              request.Pass());
+  native_viewports_.push(native_viewport_impl->GetWeakPtr());
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<mojo::Gpu> request) {
   if (!gpu_state_)
     gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
+void NativeViewportApplicationLoader::Create(
+    mojo::ApplicationConnection* connection,
+    InterfaceRequest<mojo::NativeViewportShellService> request) {
+  native_viewport_shell_service_bindings_.AddBinding(this, request.Pass());
+}
+
+void NativeViewportApplicationLoader::NewNativeSurfaceAvailable() {
+  while (!native_viewports_.empty()) {
+    base::WeakPtr<native_viewport::NativeViewportImpl> native_viewport =
+        native_viewports_.front();
+    native_viewports_.pop();
+    if (native_viewport && native_viewport->NewNativeSurfaceAvailable()) {

[qsr, 2015/08/06 14:13:20]

No {} on a single if (following what is done in this file.)

[etiennej, 2015/08/07 10:16:37]

No longer applicable.

+      return;
+    }
+  }
+  // Normally, a native surface is created only after a NativeViewport is
+  // requested.
+  NOTREACHED() << "No native viewport to attach to.";
+}
 }  // namespace shell