| 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 704604eb496c06524e35c68622be7f5a9e0765ab..c17c72a33c8b7540d17de55109559cea2c7b9585 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -72,6 +72,7 @@
|
| #include "ui/events/gesture_detection/motion_event.h"
|
| #include "ui/gfx/android/device_display_info.h"
|
| #include "ui/gfx/android/java_bitmap.h"
|
| +#include "ui/gfx/android/view_configuration.h"
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/screen.h"
|
| #include "ui/gfx/size_conversions.h"
|
| @@ -195,6 +196,19 @@ scoped_ptr<OverscrollGlow> CreateOverscrollEffect(
|
| content_view_core->GetDpiScale())));
|
| }
|
|
|
| +scoped_ptr<TouchSelectionController> CreateSelectionController(
|
| + TouchSelectionControllerClient* client,
|
| + ContentViewCore* content_view_core) {
|
| + DCHECK(client);
|
| + DCHECK(content_view_core);
|
| + int tap_timeout_ms = gfx::ViewConfiguration::GetTapTimeoutInMs();
|
| + int touch_slop_pixels = gfx::ViewConfiguration::GetTouchSlopInPixels();
|
| + return make_scoped_ptr(new TouchSelectionController(
|
| + this,
|
| + base::TimeDelta::FromMilliseconds(tap_timeout_ms),
|
| + touch_slop_pixels / content_view_core->GetDpiScale()));
|
| +}
|
| +
|
| ui::GestureProvider::Config CreateGestureProviderConfig() {
|
| ui::GestureProvider::Config config = ui::DefaultGestureProviderConfig();
|
| config.disable_click_delay =
|
| @@ -1630,7 +1644,7 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
|
| WasResized();
|
|
|
| if (!selection_controller_)
|
| - selection_controller_.reset(new TouchSelectionController(this));
|
| + selection_controller_ = CreateSelectionController(this, content_view_core_);
|
|
|
| if (overscroll_effect_enabled_ && !overscroll_effect_ &&
|
| content_view_core_->GetWindowAndroid()->GetCompositor())
|
|
|