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..a610d78c08740af70f51c013060294c5ce0bedc8 100644 |
--- a/android_webview/native/aw_contents.h |
+++ b/android_webview/native/aw_contents.h |
@@ -64,6 +64,7 @@ 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 Destroy(JNIEnv* env, jobject obj); |
void DocumentHasImages(JNIEnv* env, jobject obj, jobject message); |
void GenerateMHTML(JNIEnv* env, jobject obj, jstring jpath, jobject callback); |
@@ -95,12 +96,18 @@ class AwContents : public FindHelper::Listener { |
int match_count, |
bool finished) OVERRIDE; |
+ void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); |
+ jint ReleasePopupWebContents(JNIEnv* env, jobject obj); |
+ |
private: |
+ void SetWebContents(content::WebContents* web_contents); |
+ |
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); |
}; |