Update launcher API.

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/strings/string_split.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 87 matching lines @@
     service_provider_impl->AddService<Launcher>(
         [this](const mojo::ConnectionContext& connection_context,
                mojo::InterfaceRequest<Launcher> launcher_request) {
           bindings_.AddBinding(this, launcher_request.Pass());
         });
   }
   return true;
 }
 
 void LauncherApp::Launch(const mojo::String& application_url) {
+  DVLOG(1) << "Launching " << application_url;
+
+  mojo::NativeViewportPtr viewport;
+  mojo::ConnectToService(app_impl_->shell(), "mojo:native_viewport_service",
+                         GetProxy(&viewport));
+
+  mojo::ui::ViewProviderPtr view_provider;
+  mojo::ConnectToService(app_impl_->shell(), application_url,
+                         GetProxy(&view_provider));
+
+  LaunchInternal(viewport.Pass(), view_provider.Pass());
+}
+void LauncherApp::LaunchOnViewport(
+    mojo::InterfaceHandle<mojo::NativeViewport> viewport,
+    mojo::InterfaceHandle<mojo::ui::ViewProvider> view_provider) {
+  LaunchInternal(mojo::NativeViewportPtr::Create(viewport.Pass()),
+                 mojo::ui::ViewProviderPtr::Create(view_provider.Pass()));
+}
+
+void LauncherApp::LaunchInternal(mojo::NativeViewportPtr viewport,
+                                 mojo::ui::ViewProviderPtr view_provider) {
   uint32_t next_id = next_id_++;
   std::unique_ptr<LaunchInstance> instance(new LaunchInstance(
-      app_impl_, application_url, compositor_.get(), view_manager_.get(),
-      base::Bind(&LauncherApp::OnLaunchTermination, base::Unretained(this),
-                 next_id)));
+      app_impl_, viewport.Pass(), view_provider.Pass(), compositor_.get(),
+      view_manager_.get(), base::Bind(&LauncherApp::OnLaunchTermination,
+                                      base::Unretained(this), next_id)));
   instance->Launch();
   launch_instances_.emplace(next_id, std::move(instance));
 }
 
 void LauncherApp::OnLaunchTermination(uint32_t id) {
   launch_instances_.erase(id);
   if (launch_instances_.empty()) {
     app_impl_->Terminate();
   }
 }
 
 void LauncherApp::OnCompositorConnectionError() {
   LOG(ERROR) << "Exiting due to compositor connection error.";
   app_impl_->Terminate();
 }
 
 void LauncherApp::OnViewManagerConnectionError() {
   LOG(ERROR) << "Exiting due to view manager connection error.";
   app_impl_->Terminate();
 }
 
 void LauncherApp::OnViewAssociateConnectionError() {
   LOG(ERROR) << "Exiting due to view associate connection error.";
   app_impl_->Terminate();
 };
 
 }  // namespace launcher