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

shell/android/main.cc

 // Copyright 2013 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/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner_util.h"
 #include "base/threading/simple_thread.h"
 #include "jni/ShellService_jni.h"
 #include "mojo/common/message_pump_mojo.h"
+#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
 #include "shell/android/android_handler_loader.h"
 #include "shell/android/java_application_loader.h"
 #include "shell/android/native_viewport_application_loader.h"
 #include "shell/android/ui_application_loader_android.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/background_application_loader.h"
 #include "shell/command_line_util.h"
 #include "shell/context.h"
@@ skipping 49 matching lines @@
   scoped_ptr<Context> context;
 
   // Shell runner (thread delegate), to be uesd by the shell thread.
   scoped_ptr<MojoShellRunner> shell_runner;
 
   // Thread to run the shell on.
   scoped_ptr<base::DelegateSimpleThread> shell_thread;
 
   // Proxy to a Window Manager, initialized on the shell thread.
   mojo::WindowManagerPtr window_manager;
+  mojo::NativeViewportShellServicePtr native_viewport;
 
   // TaskRunner used to execute tasks on the shell thread.
   scoped_refptr<base::SingleThreadTaskRunner> shell_task_runner;
 
   // Event signalling when the shell task runner has been initialized.
   scoped_ptr<base::WaitableEvent> shell_runner_ready;
 };
 
 LazyInstance<InternalShellData> g_internal_data = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 84 matching lines @@
   Context* context = g_internal_data.Get().context.get();
   mojo::InterfaceRequest<mojo::ServiceProvider> services;
   services.Bind(services_handle.Pass());
   mojo::ServiceProviderPtr exposed_services;
   exposed_services.Bind(mojo::InterfacePtrInfo<mojo::ServiceProvider>(
       exposed_services_handle.Pass(), 0u));
   context->application_manager()->ConnectToApplication(
       url, GURL(), services.Pass(), exposed_services.Pass(), base::Closure());
 }
 
+void SendSurfaceAvailable() {
+  if (!g_internal_data.Get().native_viewport.get()) {
+    Context* context = g_internal_data.Get().context.get();
+    context->application_manager()->ConnectToService(
+        GURL("mojo:native_viewport_service"),
+        &g_internal_data.Get().native_viewport);
+  }
+  g_internal_data.Get().native_viewport->NewNativeSurfaceAvailable();
+}
+
 void EmbedApplicationByURL(std::string url) {
   DCHECK(g_internal_data.Get().shell_task_runner->RunsTasksOnCurrentThread());
   if (!g_internal_data.Get().window_manager.get()) {
     Context* context = g_internal_data.Get().context.get();
     context->application_manager()->ConnectToService(
         GURL("mojo:window_manager"), &g_internal_data.Get().window_manager);
   }
   g_internal_data.Get().window_manager->Embed(url, nullptr, nullptr);
 }
 
@@ skipping 119 matching lines @@
   GURL url = GURL(base::android::ConvertJavaStringToUTF8(env, jurl));
   g_internal_data.Get().shell_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&ConnectToApplicationImpl, url,
                  base::Passed(mojo::ScopedMessagePipeHandle(
                      mojo::MessagePipeHandle(services_handle))),
                  base::Passed(mojo::ScopedMessagePipeHandle(
                      mojo::MessagePipeHandle(exposed_services_handle)))));
 }
 
+static void SurfaceAvailable(JNIEnv* env, jclass clazz) {
+  g_internal_data.Get().shell_task_runner->PostTask(
+      FROM_HERE, base::Bind(&SendSurfaceAvailable));
+}
+
 bool RegisterShellService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell