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

services/native_viewport/main.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 18 matching lines @@
 class NativeViewportAppDelegate : public mojo::ApplicationDelegate,
                                   public mojo::InterfaceFactory<NativeViewport>,
                                   public mojo::InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate() : is_headless_(false) {}
   ~NativeViewportAppDelegate() override {}
 
  private:
   // mojo::ApplicationDelegate implementation.
   void Initialize(mojo::ApplicationImpl* application) override {
+    application_ = application;
     tracing_.Initialize(application);
 
     // Apply the switch for kTouchEvents to CommandLine (if set). This allows
     // redirecting the mouse to a touch device on X for testing.
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     const std::string touch_event_string("--" +
                                          std::string(switches::kTouchDevices));
     auto touch_iter = std::find(application->args().begin(),
-                                application->args().end(),
-                                touch_event_string);
+                                application->args().end(), touch_event_string);
     if (touch_iter != application->args().end() &&
         ++touch_iter != application->args().end()) {
       command_line->AppendSwitchASCII(touch_event_string, *touch_iter);
     }
 
     if (application->HasArg(mojo::kUseTestConfig))
       gfx::GLSurface::InitializeOneOffForTests();
     else if (application->HasArg(mojo::kUseOSMesa))
       gfx::GLSurface::InitializeOneOff(gfx::kGLImplementationOSMesaGL);
     else
       gfx::GLSurface::InitializeOneOff();
 
     is_headless_ = application->HasArg(mojo::kUseHeadlessConfig);
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService<NativeViewport>(this);
     connection->AddService<Gpu>(this);
     return true;
   }
 
   // mojo::InterfaceFactory<NativeViewport> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<NativeViewport> request) override {
     if (!gpu_state_.get())
       gpu_state_ = new gles2::GpuState;
-    new NativeViewportImpl(is_headless_, gpu_state_, request.Pass());
+    new NativeViewportImpl(application_, is_headless_, gpu_state_,
+                           request.Pass());
   }
 
   // mojo::InterfaceFactory<Gpu> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<Gpu> request) override {
     if (!gpu_state_.get())
       gpu_state_ = new gles2::GpuState;
     new gles2::GpuImpl(request.Pass(), gpu_state_);
   }
 
+  mojo::ApplicationImpl* application_;
   scoped_refptr<gles2::GpuState> gpu_state_;
   bool is_headless_;
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
 }
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new native_viewport::NativeViewportAppDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(application_request);
 }