OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
88 void ClearMatches(JNIEnv* env, jobject obj); | 88 void ClearMatches(JNIEnv* env, jobject obj); |
89 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); | 89 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); |
90 | 90 |
91 FindHelper* GetFindHelper(); | 91 FindHelper* GetFindHelper(); |
92 | 92 |
93 // FindHelper::Listener implementation. | 93 // FindHelper::Listener implementation. |
94 virtual void OnFindResultReceived(int active_ordinal, | 94 virtual void OnFindResultReceived(int active_ordinal, |
95 int match_count, | 95 int match_count, |
96 bool finished) OVERRIDE; | 96 bool finished) OVERRIDE; |
97 | 97 |
98 void SetPendingWebContentsForPopup(content::WebContents* pending); | |
99 jint ReleasePopupWebContents(JNIEnv* env, jobject obj) { | |
100 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.
| |
101 } | |
102 | |
103 void ReInit(JNIEnv* env, jobject obj, jint new_web_contents); | |
104 | |
98 private: | 105 private: |
99 JavaObjectWeakGlobalRef java_ref_; | 106 JavaObjectWeakGlobalRef java_ref_; |
100 scoped_ptr<content::WebContents> web_contents_; | 107 scoped_ptr<content::WebContents> web_contents_; |
101 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; | 108 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; |
102 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; | 109 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; |
103 scoped_ptr<FindHelper> find_helper_; | 110 scoped_ptr<FindHelper> find_helper_; |
111 scoped_ptr<content::WebContents> pending_contents_; | |
104 | 112 |
105 DISALLOW_COPY_AND_ASSIGN(AwContents); | 113 DISALLOW_COPY_AND_ASSIGN(AwContents); |
106 }; | 114 }; |
107 | 115 |
108 bool RegisterAwContents(JNIEnv* env); | 116 bool RegisterAwContents(JNIEnv* env); |
109 | 117 |
110 } // namespace android_webview | 118 } // namespace android_webview |
111 | 119 |
112 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 120 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
OLD | NEW |