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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 // IconHelper::Listener implementation. | 137 // IconHelper::Listener implementation. |
138 virtual void OnReceivedIcon(const SkBitmap& bitmap) OVERRIDE; | 138 virtual void OnReceivedIcon(const SkBitmap& bitmap) OVERRIDE; |
139 virtual void OnReceivedTouchIconUrl(const std::string& url, | 139 virtual void OnReceivedTouchIconUrl(const std::string& url, |
140 const bool precomposed) OVERRIDE; | 140 const bool precomposed) OVERRIDE; |
141 | 141 |
142 // BrowserViewRenderer::Client implementation. | 142 // BrowserViewRenderer::Client implementation. |
143 virtual void Invalidate() OVERRIDE; | 143 virtual void Invalidate() OVERRIDE; |
144 virtual void OnNewPicture( | 144 virtual void OnNewPicture( |
145 const base::android::JavaRef<jobject>& picture) OVERRIDE; | 145 const base::android::JavaRef<jobject>& picture) OVERRIDE; |
146 virtual gfx::Point GetLocationOnScreen() OVERRIDE; | 146 virtual gfx::Point GetLocationOnScreen() OVERRIDE; |
| 147 virtual void OnPageScaleFactorChanged(float page_scale_factor) OVERRIDE; |
147 | 148 |
148 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); | 149 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); |
149 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); | 150 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); |
150 jint ReleasePopupWebContents(JNIEnv* env, jobject obj); | 151 jint ReleasePopupWebContents(JNIEnv* env, jobject obj); |
151 | 152 |
152 private: | 153 private: |
153 void SetWebContents(content::WebContents* web_contents); | 154 void SetWebContents(content::WebContents* web_contents); |
154 | 155 |
155 JavaObjectWeakGlobalRef java_ref_; | 156 JavaObjectWeakGlobalRef java_ref_; |
156 scoped_ptr<content::WebContents> web_contents_; | 157 scoped_ptr<content::WebContents> web_contents_; |
(...skipping 13 matching lines...) Expand all Loading... |
170 std::list<OriginCallback> pending_geolocation_prompts_; | 171 std::list<OriginCallback> pending_geolocation_prompts_; |
171 | 172 |
172 DISALLOW_COPY_AND_ASSIGN(AwContents); | 173 DISALLOW_COPY_AND_ASSIGN(AwContents); |
173 }; | 174 }; |
174 | 175 |
175 bool RegisterAwContents(JNIEnv* env); | 176 bool RegisterAwContents(JNIEnv* env); |
176 | 177 |
177 } // namespace android_webview | 178 } // namespace android_webview |
178 | 179 |
179 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 180 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
OLD | NEW |