| 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 6c003df44620f384a828e460fbba36473f982419..a98104c6f7f8661e9ec11f2a253e8103b1068f4d 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -93,6 +93,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
|
| jboolean IsIncognito(JNIEnv* env, jobject obj);
|
| void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
|
| + static bool ShouldConvertToMouseEvent(const ui::MotionEvent& event);
|
| jboolean OnTouchEvent(JNIEnv* env,
|
| jobject obj,
|
| jobject motion_event,
|
| @@ -110,7 +111,10 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jfloat touch_major_0,
|
| jfloat touch_major_1,
|
| jfloat raw_pos_x,
|
| - jfloat raw_pos_y);
|
| + jfloat raw_pos_y,
|
| + jint android_tool_type_0,
|
| + jint android_tool_type_1,
|
| + jint android_button_state);
|
| jboolean SendMouseMoveEvent(JNIEnv* env,
|
| jobject obj,
|
| jlong time_ms,
|
| @@ -374,6 +378,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
|
|
| bool accessibility_enabled_;
|
|
|
| + int mouse_drag_start_x_;
|
| + int mouse_drag_start_y_;
|
| +
|
| // Manages injecting Java objects.
|
| scoped_ptr<JavaBridgeDispatcherHostManager>
|
| java_bridge_dispatcher_host_manager_;
|
|
|