[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 eb10438ad9fdd1657bdfc358b110d2ca58513d44..c8e3e90fc634d7cce32101126ee9b9d717599b3b 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -67,6 +67,8 @@ class AwContents : public FindHelper::Listener,
 
   // Methods called from Java.
   jint GetWebContents(JNIEnv* env, jobject obj);
+  void SetWebContents(JNIEnv* env, jobject obj, jint web_contents);
+
   void DidInitializeContentViewCore(JNIEnv* env, jobject obj,
                                     jint content_view_core);
   void Destroy(JNIEnv* env, jobject obj);
@@ -107,8 +109,12 @@ class AwContents : public FindHelper::Listener,
   virtual void ScheduleComposite() OVERRIDE;
   virtual void OnSwapBuffersCompleted() OVERRIDE;
 
+  void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
+  jint ReleasePopupWebContents(JNIEnv* env, jobject obj);
+
  private:
   void Invalidate();
+  void SetWebContents(content::WebContents* web_contents);
 
   JavaObjectWeakGlobalRef java_ref_;
   scoped_ptr<content::WebContents> web_contents_;
@@ -120,6 +126,7 @@ class AwContents : public FindHelper::Listener,
   bool view_visible_;
   bool compositor_visible_;
   bool is_composite_pending_;
+  scoped_ptr<content::WebContents> pending_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };