Chromium Code Reviews| Index: content/browser/android/content_view_core_impl.h |
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h |
| index 3e04591a08e8dd8d3bd9faa9d290f7da13f5ca53..011afd473e0652707822eb3fe5b08a791f1a86a8 100644 |
| --- a/content/browser/android/content_view_core_impl.h |
| +++ b/content/browser/android/content_view_core_impl.h |
| @@ -13,9 +13,11 @@ |
| #include "base/i18n/rtl.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/process.h" |
| +#include "content/browser/renderer_host/render_widget_host_view_android.h" |
| #include "content/public/browser/android/content_view_core.h" |
| #include "content/public/browser/notification_observer.h" |
| #include "googleurl/src/gurl.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| #include "ui/gfx/rect.h" |
| struct WebMenuItem; |
| @@ -31,7 +33,7 @@ class ContentViewCoreImpl : public ContentViewCore, |
| ContentViewCoreImpl(JNIEnv* env, |
| jobject obj, |
| WebContents* web_contents); |
| - virtual void Destroy(JNIEnv* env, jobject obj); |
| + virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE; |
| // -------------------------------------------------------------------------- |
| // Methods called from Java via JNI |
| @@ -56,6 +58,46 @@ class ContentViewCoreImpl : public ContentViewCore, |
| JNIEnv* env, jobject obj) const; |
| jboolean IsIncognito(JNIEnv* env, jobject obj); |
| jboolean Crashed(JNIEnv* env, jobject obj) const { return tab_crashed_; } |
| + |
| + jboolean TouchEvent(JNIEnv* env, |
| + jobject obj, |
| + jlong time_ms, |
| + jint type, |
| + jobjectArray pts); |
| + |
|
Ted C
2012/07/27 01:31:53
why the blank line here and above?
|
| + void ScrollBegin(JNIEnv* env, jobject obj, jlong time_ms, jint x, jint y); |
| + void ScrollEnd(JNIEnv* env, jobject obj, jlong time_ms); |
| + void ScrollBy(JNIEnv* env, jobject obj, jlong time_ms, jint dx, jint dy); |
| + void FlingStart(JNIEnv* env, |
| + jobject obj, |
| + jlong time_ms, |
| + jint x, |
| + jint y, |
| + jint vx, |
| + jint vy); |
| + void FlingCancel(JNIEnv* env, jobject obj, jlong time_ms); |
| + void SingleTap(JNIEnv* env, |
| + jobject obj, |
| + jlong time_ms, |
| + jint x, |
| + jint y, |
| + jboolean link_preview_tap); |
| + void ShowPressState(JNIEnv* env, jobject obj, jlong time_ms, jint x, jint y); |
| + void DoubleTap(JNIEnv* env, jobject obj, jlong time_ms, jint x, jint y) ; |
| + void LongPress(JNIEnv* env, |
| + jobject obj, |
| + jlong time_ms, |
| + jint x, |
| + jint y, |
| + jboolean link_preview_tap); |
| + void PinchBegin(JNIEnv* env, jobject obj, jlong time_ms, jint x, jint y); |
| + void PinchEnd(JNIEnv* env, jobject obj, jlong time_ms); |
| + void PinchBy(JNIEnv* env, |
| + jobject obj, |
| + jlong time_ms, |
| + jint x, |
| + jint y, |
| + jfloat delta); |
| jboolean CanGoBack(JNIEnv* env, jobject obj); |
| jboolean CanGoForward(JNIEnv* env, jobject obj); |
| jboolean CanGoToOffset(JNIEnv* env, jobject obj, jint offset); |
| @@ -85,6 +127,8 @@ class ContentViewCoreImpl : public ContentViewCore, |
| void SetTitle(const string16& title); |
| bool HasFocus(); |
| + void ConfirmTouchEvent(bool handled); |
| + void DidSetNeedTouchEvents(bool need_touch_events); |
| void OnSelectionChanged(const std::string& text); |
| void OnSelectionBoundsChanged(int startx, |
| int starty, |
| @@ -131,6 +175,12 @@ class ContentViewCoreImpl : public ContentViewCore, |
| void InitJNI(JNIEnv* env, jobject obj); |
| + RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid(); |
| + |
| + void SendGestureEvent(WebKit::WebInputEvent::Type type, long time_ms, |
| + int x, int y, |
| + float dx, float dy, bool link_preview_tap); |
| + |
| void PostLoadUrl(const GURL& url); |
| struct JavaObject; |
| @@ -151,6 +201,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
| bool RegisterContentViewCore(JNIEnv* env); |
| -}; // namespace content |
| +} // namespace content |
| #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |