| Index: ui/touch_selection/touch_selection_controller.h
|
| diff --git a/ui/touch_selection/touch_selection_controller.h b/ui/touch_selection/touch_selection_controller.h
|
| index bbffc87c80dd030f7785673f2778f492a29fe98c..67e1a7fd235b0cac2bb8feb15b81df8e95d6006e 100644
|
| --- a/ui/touch_selection/touch_selection_controller.h
|
| +++ b/ui/touch_selection/touch_selection_controller.h
|
| @@ -80,7 +80,8 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| // Note that such updates will trigger handle updates only if preceded
|
| // by an appropriate call to allow automatic showing.
|
| void OnSelectionBoundsChanged(const gfx::SelectionBound& start,
|
| - const gfx::SelectionBound& end);
|
| + const gfx::SelectionBound& end,
|
| + bool is_handle_visible);
|
|
|
| // To be called when the viewport rect has been changed. This is used for
|
| // setting the state of the handles.
|
| @@ -106,10 +107,6 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| // long-press drag.
|
| void OnScrollBeginEvent();
|
|
|
| - // Allow showing the selection handles from the most recent selection bounds
|
| - // update (if valid), or a future valid bounds update.
|
| - void AllowShowingFromCurrentSelection();
|
| -
|
| // Hide the handles and suppress bounds updates until the next explicit
|
| // showing allowance.
|
| void HideAndDisallowShowingAutomatically();
|
| @@ -147,10 +144,6 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
|
|
| ActiveStatus active_status() const { return active_status_; }
|
|
|
| - bool insertion_active_or_requested() const {
|
| - return activate_insertion_automatically_;
|
| - }
|
| -
|
| private:
|
| friend class TouchSelectionControllerTestApi;
|
|
|
| @@ -174,8 +167,6 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| gfx::PointF GetSelectionStart() const override;
|
| gfx::PointF GetSelectionEnd() const override;
|
|
|
| - void ShowInsertionHandleAutomatically();
|
| - void ShowSelectionHandlesAutomatically();
|
| bool WillHandleTapOrLongPress(const gfx::PointF& location);
|
|
|
| void OnInsertionChanged();
|
| @@ -219,11 +210,9 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
|
| ActiveStatus active_status_;
|
|
|
| std::unique_ptr<TouchHandle> insertion_handle_;
|
| - bool activate_insertion_automatically_;
|
|
|
| std::unique_ptr<TouchHandle> start_selection_handle_;
|
| std::unique_ptr<TouchHandle> end_selection_handle_;
|
| - bool activate_selection_automatically_;
|
|
|
| bool selection_empty_;
|
| bool selection_editable_;
|
|
|