Chromium Code Reviews| Index: android_webview/native/aw_contents.h |
| diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h |
| index e9d9504116684fc9c4473b58d30f37a2005297d5..c2b7e3be847b0ce6533693547e32d8fb782b2f26 100644 |
| --- a/android_webview/native/aw_contents.h |
| +++ b/android_webview/native/aw_contents.h |
| @@ -156,6 +156,8 @@ class AwContents : public FindHelper::Listener, |
| virtual void UpdateGlobalVisibleRect() OVERRIDE; |
| virtual void OnNewPicture() OVERRIDE; |
| virtual gfx::Point GetLocationOnScreen() OVERRIDE; |
| + virtual void SetMaxContainerViewScrollOffset( |
| + gfx::Vector2d new_value) OVERRIDE; |
| virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE; |
| virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE; |
| @@ -163,8 +165,8 @@ class AwContents : public FindHelper::Listener, |
| void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); |
| jint ReleasePopupAwContents(JNIEnv* env, jobject obj); |
| - void ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix); |
| - void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale); |
| + void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y); |
| + void SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale); |
|
aelias_OOO_until_Jul13
2013/09/24 22:03:19
nit: Chromium style is for the underscore, also xP
mkosiba (inactive)
2013/09/25 14:23:49
yes, accidental change, thanks for pointing it out
|
| void SetDisplayedPageScaleFactor(JNIEnv* env, |
| jobject obj, |
| jfloat page_scale_factor); |