Change GestureConfiguration types to be consistent with each other and with the

ui/events/gestures/gesture_configuration.h

Index: ui/events/gestures/gesture_configuration.h
diff --git a/ui/events/gestures/gesture_configuration.h b/ui/events/gestures/gesture_configuration.h
index 1537b8e8be3058769b4a7b258c4484ed2f220b25..c72208ef1a44c814f5a8e471a86141f9b4607686 100644
--- a/ui/events/gestures/gesture_configuration.h
+++ b/ui/events/gestures/gesture_configuration.h
@@ -18,10 +18,12 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
  public:
   // Ordered alphabetically ignoring underscores, to align with the
   // associated list of prefs in gesture_prefs_aura.cc.
-  static int default_radius() {
+  static float default_radius() {
     return default_radius_;
   }
-  static void set_default_radius(int radius) { default_radius_ = radius; }
+  static void set_default_radius(float radius) {
+    default_radius_ = radius;
+  }
   static int fling_max_cancel_to_down_time_in_ms() {
     return fling_max_cancel_to_down_time_in_ms_;
   }
@@ -34,34 +36,34 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
   static void set_fling_max_tap_gap_time_in_ms(int val) {
     fling_max_tap_gap_time_in_ms_ = val;
   }
-  static double long_press_time_in_seconds() {
-    return long_press_time_in_seconds_;
+  static int long_press_time_in_ms() {
+    return long_press_time_in_ms_;
   }
-  static double semi_long_press_time_in_seconds() {
-    return semi_long_press_time_in_seconds_;
+  static int semi_long_press_time_in_ms() {
+    return semi_long_press_time_in_ms_;
   }
-  static double max_distance_for_two_finger_tap_in_pixels() {
+  static float max_distance_for_two_finger_tap_in_pixels() {
     return max_distance_for_two_finger_tap_in_pixels_;
   }
-  static void set_max_distance_for_two_finger_tap_in_pixels(double val) {
+  static void set_max_distance_for_two_finger_tap_in_pixels(float val) {
     max_distance_for_two_finger_tap_in_pixels_ = val;
   }
-  static void set_long_press_time_in_seconds(double val) {
-    long_press_time_in_seconds_ = val;
+  static void set_long_press_time_in_ms(int val) {
+    long_press_time_in_ms_ = val;
   }
-  static void set_semi_long_press_time_in_seconds(double val) {
-    semi_long_press_time_in_seconds_ = val;
+  static void set_semi_long_press_time_in_ms(int val) {
+    semi_long_press_time_in_ms_ = val;
   }
-  static double max_seconds_between_double_click() {
-    return max_seconds_between_double_click_;
+  static int max_time_between_double_click_in_ms() {
+    return max_time_between_double_click_in_ms_;
   }
-  static void set_max_seconds_between_double_click(double val) {
-    max_seconds_between_double_click_ = val;
+  static void set_max_time_between_double_click_in_ms(int val) {
+    max_time_between_double_click_in_ms_ = val;
   }
-  static int max_separation_for_gesture_touches_in_pixels() {
+  static float max_separation_for_gesture_touches_in_pixels() {
     return max_separation_for_gesture_touches_in_pixels_;
   }
-  static void set_max_separation_for_gesture_touches_in_pixels(int val) {
+  static void set_max_separation_for_gesture_touches_in_pixels(float val) {
     max_separation_for_gesture_touches_in_pixels_ = val;
   }
   static float max_swipe_deviation_angle() {
@@ -70,34 +72,34 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
   static void set_max_swipe_deviation_angle(float val) {
     max_swipe_deviation_angle_ = val;
   }
-  static double max_touch_down_duration_in_seconds_for_click() {
-    return max_touch_down_duration_in_seconds_for_click_;
+  static int max_touch_down_duration_for_click_in_ms() {
+    return max_touch_down_duration_for_click_in_ms_;
   }
-  static void set_max_touch_down_duration_in_seconds_for_click(double val) {
-    max_touch_down_duration_in_seconds_for_click_ = val;
+  static void set_max_touch_down_duration_for_click_in_ms(int val) {
+    max_touch_down_duration_for_click_in_ms_ = val;
   }
-  static double max_touch_move_in_pixels_for_click() {
+  static float max_touch_move_in_pixels_for_click() {
     return max_touch_move_in_pixels_for_click_;
   }
-  static void set_max_touch_move_in_pixels_for_click(double val) {
+  static void set_max_touch_move_in_pixels_for_click(float val) {
     max_touch_move_in_pixels_for_click_ = val;
   }
-  static double max_distance_between_taps_for_double_tap() {
+  static float max_distance_between_taps_for_double_tap() {
     return max_distance_between_taps_for_double_tap_;
   }
-  static void set_max_distance_between_taps_for_double_tap(double val) {
+  static void set_max_distance_between_taps_for_double_tap(float val) {
     max_distance_between_taps_for_double_tap_ = val;
   }
-  static double min_distance_for_pinch_scroll_in_pixels() {
+  static float min_distance_for_pinch_scroll_in_pixels() {
     return min_distance_for_pinch_scroll_in_pixels_;
   }
-  static void set_min_distance_for_pinch_scroll_in_pixels(double val) {
+  static void set_min_distance_for_pinch_scroll_in_pixels(float val) {
     min_distance_for_pinch_scroll_in_pixels_ = val;
   }
-  static double min_pinch_update_distance_in_pixels() {
+  static float min_pinch_update_distance_in_pixels() {
     return min_pinch_update_distance_in_pixels_;
   }
-  static void set_min_pinch_update_distance_in_pixels(double val) {
+  static void set_min_pinch_update_distance_in_pixels(float val) {
     min_pinch_update_distance_in_pixels_ = val;
   }
   static float min_scroll_velocity() {
@@ -106,16 +108,16 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
   static void set_min_scroll_velocity(float val) {
     min_scroll_velocity_ = val;
   }
-  static double min_swipe_speed() {
+  static float min_swipe_speed() {
     return min_swipe_speed_;
   }
-  static void set_min_swipe_speed(double val) {
+  static void set_min_swipe_speed(float val) {
     min_swipe_speed_ = val;
   }
-  static int min_scaling_span_in_pixels() {
+  static float min_scaling_span_in_pixels() {
     return min_scaling_span_in_pixels_;
   };
-  static void set_min_scaling_span_in_pixels(int val) {
+  static void set_min_scaling_span_in_pixels(float val) {
     min_scaling_span_in_pixels_ = val;
   }
   static int show_press_delay_in_ms() {
@@ -151,12 +153,12 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
 
   // The default touch radius length used when the only information given
   // by the device is the touch center.
-  static int default_radius_;
+  static float default_radius_;
 
   // The maximum allowed distance between two fingers for a two finger tap. If
   // the distance between two fingers is greater than this value, we will not
   // recognize a two finger tap.
-  static double max_distance_for_two_finger_tap_in_pixels_;
+  static float max_distance_for_two_finger_tap_in_pixels_;
 
   // Maximum time between a GestureFlingCancel and a mousedown such that the
   // mousedown is considered associated with the cancel event.
@@ -166,20 +168,20 @@ class EVENTS_BASE_EXPORT GestureConfiguration {
   // suppressable tap.
   static int fling_max_tap_gap_time_in_ms_;
 
-  static double long_press_time_in_seconds_;
-  static double semi_long_press_time_in_seconds_;
-  static double max_seconds_between_double_click_;
-  static double max_separation_for_gesture_touches_in_pixels_;
+  static int long_press_time_in_ms_;
+  static int semi_long_press_time_in_ms_;
+  static int max_time_between_double_click_in_ms_;
+  static float max_separation_for_gesture_touches_in_pixels_;
   static float max_swipe_deviation_angle_;
-  static double max_touch_down_duration_in_seconds_for_click_;
-  static double max_touch_move_in_pixels_for_click_;
-  static double max_distance_between_taps_for_double_tap_;
-  static double min_distance_for_pinch_scroll_in_pixels_;
+  static int max_touch_down_duration_for_click_in_ms_;
+  static float max_touch_move_in_pixels_for_click_;
+  static float max_distance_between_taps_for_double_tap_;
+  static float min_distance_for_pinch_scroll_in_pixels_;
   // Only used with --compensate-for-unstable-pinch-zoom.
-  static double min_pinch_update_distance_in_pixels_;
+  static float min_pinch_update_distance_in_pixels_;
   static float min_scroll_velocity_;
-  static double min_swipe_speed_;
-  static int min_scaling_span_in_pixels_;
+  static float min_swipe_speed_;
+  static float min_scaling_span_in_pixels_;
   static int show_press_delay_in_ms_;
   static int scroll_debounce_interval_in_ms_;
   static float fling_velocity_cap_;