Reland Unified Gesture Recognizer for Aura

ui/events/gesture_detection/gesture_config_helper_aura.cc

 // 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.
 
+// MSVC++ requires this to be set before any other includes to get M_PI.
+#define _USE_MATH_DEFINES
+
 #include "ui/events/gesture_detection/gesture_config_helper.h"
 
+#include <cmath>
+
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/gfx/screen.h"
 
 namespace ui {
 namespace {
 
 GestureDetector::Config DefaultGestureDetectorConfig() {
   GestureDetector::Config config;
 
   config.longpress_timeout = base::TimeDelta::FromMilliseconds(
       GestureConfiguration::long_press_time_in_seconds() * 1000.);
   config.showpress_timeout = base::TimeDelta::FromMilliseconds(
       GestureConfiguration::show_press_delay_in_ms());
   config.double_tap_timeout = base::TimeDelta::FromMilliseconds(
       GestureConfiguration::semi_long_press_time_in_seconds() * 1000.);
   config.touch_slop =
       GestureConfiguration::max_touch_move_in_pixels_for_click();
   config.double_tap_slop =
       GestureConfiguration::max_distance_between_taps_for_double_tap();
   config.minimum_fling_velocity =
       GestureConfiguration::min_scroll_velocity();
-  config.maximum_fling_velocity =
-      GestureConfiguration::fling_velocity_cap();
+  config.maximum_fling_velocity = GestureConfiguration::fling_velocity_cap();
   config.swipe_enabled = true;
   config.minimum_swipe_velocity = GestureConfiguration::min_swipe_speed();
   config.maximum_swipe_deviation_angle =
-      atan2(1.f, GestureConfiguration::max_swipe_deviation_ratio());
+      atan2(1.f, GestureConfiguration::max_swipe_deviation_ratio()) * 180.0f /
+      static_cast<float>(M_PI);
   config.two_finger_tap_enabled = true;
   config.two_finger_tap_max_separation =
       GestureConfiguration::max_distance_for_two_finger_tap_in_pixels();
   config.two_finger_tap_timeout = base::TimeDelta::FromMilliseconds(
       GestureConfiguration::max_touch_down_duration_in_seconds_for_click() *
       1000.);
 
   return config;
 }
 
 ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig() {
   ScaleGestureDetector::Config config;
 
   config.gesture_detector_config = DefaultGestureDetectorConfig();
   config.min_scaling_touch_major = GestureConfiguration::default_radius() * 2;
-  config.min_scaling_span =
-      GestureConfiguration::min_distance_for_pinch_scroll_in_pixels();
+  config.min_scaling_span = GestureConfiguration::min_scaling_span_in_pixels();
   return config;
 }
 
 }  // namespace
 
 GestureProvider::Config DefaultGestureProviderConfig() {
   GestureProvider::Config config;
   config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
   config.gesture_detector_config = DefaultGestureDetectorConfig();
   config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig();
   config.gesture_begin_end_types_enabled = true;
   return config;
 }
 
 }  // namespace ui