| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 20d45e128a57f287f7675e84012d9db42902d8ac..3ae7d19a2f0610cd1c97d2b865a00f216cbe83ba 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -268,7 +268,8 @@ scoped_ptr<ui::TouchSelectionController> CreateSelectionController(
|
| return make_scoped_ptr(new ui::TouchSelectionController(
|
| client,
|
| base::TimeDelta::FromMilliseconds(tap_timeout_ms),
|
| - touch_slop_pixels / content_view_core->GetDpiScale()));
|
| + touch_slop_pixels / content_view_core->GetDpiScale(),
|
| + false));
|
| }
|
|
|
| scoped_ptr<OverscrollControllerAndroid> CreateOverscrollController(
|
| @@ -1349,7 +1350,7 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
|
| overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
|
|
|
| if (selection_controller_) {
|
| - selection_controller_->OnSelectionBoundsChanged(
|
| + selection_controller_->OnSelectionBoundsUpdated(
|
| ui::SelectionBound(frame_metadata.selection_start),
|
| ui::SelectionBound(frame_metadata.selection_end));
|
| }
|
| @@ -1668,7 +1669,7 @@ void RenderWidgetHostViewAndroid::OnShowingPastePopup(
|
| selection_controller_->HideAndDisallowShowingAutomatically();
|
| selection_controller_->OnSelectionEditable(true);
|
| selection_controller_->OnSelectionEmpty(true);
|
| - selection_controller_->OnSelectionBoundsChanged(insertion_bound,
|
| + selection_controller_->OnSelectionBoundsUpdated(insertion_bound,
|
| insertion_bound);
|
| selection_controller_->AllowShowingFromCurrentSelection();
|
| }
|
|
|