Adopt ui::GestureConfiguration on Android

ui/events/gesture_detection/gesture_config_helper_android.cc

Index: ui/events/gesture_detection/gesture_config_helper_android.cc
diff --git a/ui/events/gesture_detection/gesture_config_helper_android.cc b/ui/events/gesture_detection/gesture_config_helper_android.cc
deleted file mode 100644
index 0b23346bedaed0157a736a02f3297f1c40bd6279..0000000000000000000000000000000000000000
--- a/ui/events/gesture_detection/gesture_config_helper_android.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/events/gesture_detection/gesture_config_helper.h"
-
-#include "ui/gfx/android/view_configuration.h"
-#include "ui/gfx/screen.h"
-
-using gfx::ViewConfiguration;
-
-namespace ui {
-namespace {
-// TODO(jdduke): Adopt GestureConfiguration on Android, crbug/339203.
-
-// This was the minimum tap/press size used on Android before the new gesture
-// detection pipeline.
-const float kMinGestureBoundsLengthDips = 24.f;
-
-// This value is somewhat arbitrary, but provides a reasonable maximum
-// approximating a large thumb depression.
-const float kMaxGestureBoundsLengthDips = kMinGestureBoundsLengthDips * 4.f;
-
-GestureDetector::Config DefaultGestureDetectorConfig(
-    const gfx::Display& display) {
-  GestureDetector::Config config;
-
-  config.longpress_timeout = base::TimeDelta::FromMilliseconds(
-      ViewConfiguration::GetLongPressTimeoutInMs());
-  config.showpress_timeout =
-      base::TimeDelta::FromMilliseconds(ViewConfiguration::GetTapTimeoutInMs());
-  config.double_tap_timeout = base::TimeDelta::FromMilliseconds(
-      ViewConfiguration::GetDoubleTapTimeoutInMs());
-
-  const float px_to_dp = 1.f / display.device_scale_factor();
-  config.touch_slop =
-      ViewConfiguration::GetTouchSlopInPixels() * px_to_dp;
-  config.double_tap_slop =
-      ViewConfiguration::GetDoubleTapSlopInPixels() * px_to_dp;
-  config.minimum_fling_velocity =
-      ViewConfiguration::GetMinimumFlingVelocityInPixelsPerSecond() * px_to_dp;
-  config.maximum_fling_velocity =
-      ViewConfiguration::GetMaximumFlingVelocityInPixelsPerSecond() * px_to_dp;
-
-  return config;
-}
-
-ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig(
-    const gfx::Display& display) {
-  ScaleGestureDetector::Config config;
-
-  const float px_to_dp = 1.f / display.device_scale_factor();
-  config.span_slop = ViewConfiguration::GetTouchSlopInPixels() * 2.f * px_to_dp;
-  config.min_scaling_touch_major =
-      ViewConfiguration::GetMinScalingTouchMajorInPixels() * px_to_dp;
-  config.min_scaling_span =
-      ViewConfiguration::GetMinScalingSpanInPixels() * px_to_dp;
-  config.min_pinch_update_span_delta = 0.f;
-
-  return config;
-}
-
-}  // namespace
-
-GestureProvider::Config DefaultGestureProviderConfig() {
-  GestureProvider::Config config;
-  config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
-  config.gesture_detector_config = DefaultGestureDetectorConfig(config.display);
-  config.scale_gesture_detector_config =
-      DefaultScaleGestureDetectorConfig(config.display);
-  config.gesture_begin_end_types_enabled = false;
-  config.min_gesture_bounds_length = kMinGestureBoundsLengthDips;
-  config.max_gesture_bounds_length = kMaxGestureBoundsLengthDips;
-  return config;
-}
-
-}  // namespace ui