| 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 <list> | 9 #include <list> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 bool finished) OVERRIDE; | 149 bool finished) OVERRIDE; |
| 150 // IconHelper::Listener implementation. | 150 // IconHelper::Listener implementation. |
| 151 virtual void OnReceivedIcon(const SkBitmap& bitmap) OVERRIDE; | 151 virtual void OnReceivedIcon(const SkBitmap& bitmap) OVERRIDE; |
| 152 virtual void OnReceivedTouchIconUrl(const std::string& url, | 152 virtual void OnReceivedTouchIconUrl(const std::string& url, |
| 153 const bool precomposed) OVERRIDE; | 153 const bool precomposed) OVERRIDE; |
| 154 | 154 |
| 155 // BrowserViewRenderer::Client implementation. | 155 // BrowserViewRenderer::Client implementation. |
| 156 virtual void Invalidate() OVERRIDE; | 156 virtual void Invalidate() OVERRIDE; |
| 157 virtual void OnNewPicture( | 157 virtual void OnNewPicture( |
| 158 const base::android::JavaRef<jobject>& picture) OVERRIDE; | 158 const base::android::JavaRef<jobject>& picture) OVERRIDE; |
| 159 virtual gfx::Point GetLocationOnScreen() OVERRIDE; |
| 159 | 160 |
| 160 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); | 161 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); |
| 161 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); | 162 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); |
| 162 jint ReleasePopupWebContents(JNIEnv* env, jobject obj); | 163 jint ReleasePopupWebContents(JNIEnv* env, jobject obj); |
| 163 | 164 |
| 164 private: | 165 private: |
| 165 void SetWebContents(content::WebContents* web_contents); | 166 void SetWebContents(content::WebContents* web_contents); |
| 166 | 167 |
| 167 JavaObjectWeakGlobalRef java_ref_; | 168 JavaObjectWeakGlobalRef java_ref_; |
| 168 scoped_ptr<content::WebContents> web_contents_; | 169 scoped_ptr<content::WebContents> web_contents_; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 182 std::list<OriginCallback> pending_geolocation_prompts_; | 183 std::list<OriginCallback> pending_geolocation_prompts_; |
| 183 | 184 |
| 184 DISALLOW_COPY_AND_ASSIGN(AwContents); | 185 DISALLOW_COPY_AND_ASSIGN(AwContents); |
| 185 }; | 186 }; |
| 186 | 187 |
| 187 bool RegisterAwContents(JNIEnv* env); | 188 bool RegisterAwContents(JNIEnv* env); |
| 188 | 189 |
| 189 } // namespace android_webview | 190 } // namespace android_webview |
| 190 | 191 |
| 191 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 192 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
| OLD | NEW |