| 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 6e4708477cd4e8b39b024c6ff8fc33b88990e6fa..eea6814dc14217c7fb6a8918771b7e6455a1a957 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -117,7 +117,8 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jfloat raw_pos_y,
|
| jint android_tool_type_0,
|
| jint android_tool_type_1,
|
| - jint android_button_state);
|
| + jint android_button_state,
|
| + jboolean is_touch_handle_event);
|
| jboolean SendMouseMoveEvent(JNIEnv* env,
|
| jobject obj,
|
| jlong time_ms,
|
| @@ -151,6 +152,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jfloat x1, jfloat y1,
|
| jfloat x2, jfloat y2);
|
| void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
|
| + void HideTextHandles(JNIEnv* env, jobject obj);
|
|
|
| void ResetGestureDetection(JNIEnv* env, jobject obj);
|
| void SetDoubleTapSupportEnabled(JNIEnv* env, jobject obj, jboolean enabled);
|
| @@ -265,8 +267,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| InputEventAckState ack_result);
|
| bool FilterInputEvent(const blink::WebInputEvent& event);
|
| void OnSelectionChanged(const std::string& text);
|
| - void OnSelectionBoundsChanged(
|
| - const ViewHostMsg_SelectionBounds_Params& params);
|
| + void OnSelectionEvent(SelectionEventType event,
|
| + const gfx::PointF& anchor_position);
|
| + scoped_ptr<TouchHandleDrawable> CreatePopupTouchHandleDrawable();
|
|
|
| void StartContentIntent(const GURL& content_url);
|
|
|
| @@ -296,8 +299,6 @@ class ContentViewCoreImpl : public ContentViewCore,
|
|
|
| void SetAccessibilityEnabledInternal(bool enabled);
|
|
|
| - void ShowSelectionHandlesAutomatically() const;
|
| -
|
| bool IsFullscreenRequiredForOrientationLock() const;
|
|
|
| // --------------------------------------------------------------------------
|
| @@ -312,6 +313,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| void AttachLayer(scoped_refptr<cc::Layer> layer);
|
| void RemoveLayer(scoped_refptr<cc::Layer> layer);
|
|
|
| + void SelectBetweenCoordinates(const gfx::PointF& start,
|
| + const gfx::PointF& end);
|
| +
|
| private:
|
| class ContentViewUserData;
|
|
|
|
|