[Android WebView] AwContentsClient.shouldCreate window callback part 2.

android_webview/native/aw_contents.h

Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index e1d70a017dd5437250b12320ed9195b152408ab6..8399f44800b85c6d65528fe1341273d3b012a43f 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -95,12 +95,20 @@ class AwContents : public FindHelper::Listener {
                                     int match_count,
                                     bool finished) OVERRIDE;
 
+  void SetPendingWebContentsForPopup(content::WebContents* pending);
+  jint ReleasePopupWebContents(JNIEnv* env, jobject obj) {
+    return reinterpret_cast<jint>(pending_contents_.release());

[joth, 2012/11/16 06:24:31]

put in .cc ?

[benm (inactive), 2012/11/16 12:29:09]

Done.

+  }
+
+  void ReInit(JNIEnv* env, jobject obj, jint new_web_contents);
+
  private:
   JavaObjectWeakGlobalRef java_ref_;
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
   scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
   scoped_ptr<FindHelper> find_helper_;
+  scoped_ptr<content::WebContents> pending_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };