Feed back to the ServiceTabLauncher when the tab has been created.

chrome/browser/android/service_tab_launcher.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 "chrome/browser/android/service_tab_launcher.h"
 
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "content/public/browser/page_navigator.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ServiceTabLauncher_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 
+// Called by Java when the WebContents instance for a request Id is available.
+void OnWebContentsForRequestAvailable(
+    JNIEnv* env, jclass clazz, jint request_id, jobject android_web_contents) {
+  chrome::android::ServiceTabLauncher::GetInstance()->OnTabLaunched(
+      request_id,
+      content::WebContents::FromJavaWebContents(android_web_contents));
+}
+
 namespace chrome {
 namespace android {
 
 // static
 ServiceTabLauncher* ServiceTabLauncher::GetInstance() {
   return Singleton<ServiceTabLauncher>::get();
 }
 
-ServiceTabLauncher::ServiceTabLauncher() {
+ServiceTabLauncher::ServiceTabLauncher()
+    : last_request_id_(0) {
   java_object_.Reset(
       Java_ServiceTabLauncher_create(
           AttachCurrentThread(),
           reinterpret_cast<intptr_t>(this),
           GetApplicationContext()));
 }
 
 ServiceTabLauncher::~ServiceTabLauncher() {}
 
 void ServiceTabLauncher::LaunchTab(
     content::BrowserContext* browser_context,

[Bernhard Bauer, 2015/02/04 18:09:12]

You don't really seem to need the browser context.

[Peter Beverloo, 2015/02/19 16:03:06]

Rebased. We do now per a previous patch, to check whether we're in incognito
mode :-).

     const content::OpenURLParams& params,
     base::Callback<void(content::WebContents*)> callback) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> url = ConvertUTF8ToJavaString(
       env, params.url.spec());
 
-  Java_ServiceTabLauncher_launchTab(env, java_object_.obj(), url.obj());
+  tab_launched_callbacks_[++last_request_id_] = callback;
+  Java_ServiceTabLauncher_launchTab(env,
+                                    java_object_.obj(),
+                                    last_request_id_,
+                                    url.obj());
+}
 
-  // TODO(peter): We need to wait for the Android Activity to reply to the
-  // launch intent with the ID of the launched Web Contents, so that the Java
-  // side can invoke a method on the native side with the request id and the
-  // WebContents enabling us to invoke |callback|. See https://crbug.com/454809.
+void ServiceTabLauncher::OnTabLaunched(int request_id,
+                                      content::WebContents* web_contents) {

[Ted C, 2015/02/06 01:18:18]

+1 indent

[Peter Beverloo, 2015/02/19 16:03:06]

Done.

+  DCHECK_EQ(tab_launched_callbacks_.count(request_id), 1u);
+  DCHECK(web_contents);
+
+  tab_launched_callbacks_[request_id].Run(web_contents);
+  tab_launched_callbacks_.erase(request_id);
 }
 
 bool ServiceTabLauncher::RegisterServiceTabLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome