| Index: ui/events/gestures/gesture_configuration.cc
|
| diff --git a/ui/events/gestures/gesture_configuration.cc b/ui/events/gestures/gesture_configuration.cc
|
| index 1ce13d7f12ed67392b282f3c20baa56899ebfd56..78f6b5786e93b762a93bf5a69031a4a47a1bd248 100644
|
| --- a/ui/events/gestures/gesture_configuration.cc
|
| +++ b/ui/events/gestures/gesture_configuration.cc
|
| @@ -6,30 +6,28 @@
|
|
|
| namespace ui {
|
|
|
| -int GestureConfiguration::default_radius_ = 25;
|
| +float GestureConfiguration::default_radius_ = 25;
|
| int GestureConfiguration::fling_max_cancel_to_down_time_in_ms_ = 400;
|
| int GestureConfiguration::fling_max_tap_gap_time_in_ms_ = 200;
|
| float GestureConfiguration::fling_velocity_cap_ = 17000.0f;
|
| int GestureConfiguration::tab_scrub_activation_delay_in_ms_ = 200;
|
| -double GestureConfiguration::long_press_time_in_seconds_ = 1.0;
|
| -double GestureConfiguration::semi_long_press_time_in_seconds_ = 0.4;
|
| -double GestureConfiguration::max_distance_for_two_finger_tap_in_pixels_ = 300;
|
| -double GestureConfiguration::max_seconds_between_double_click_ = 0.7;
|
| -double
|
| - GestureConfiguration::max_separation_for_gesture_touches_in_pixels_ = 150;
|
| +int GestureConfiguration::long_press_time_in_ms_ = 1000;
|
| +int GestureConfiguration::semi_long_press_time_in_ms_ = 400;
|
| +float GestureConfiguration::max_distance_for_two_finger_tap_in_pixels_ = 300;
|
| +int GestureConfiguration::max_time_between_double_click_in_ms_ = 700;
|
| +float GestureConfiguration::max_separation_for_gesture_touches_in_pixels_ = 150;
|
| float GestureConfiguration::max_swipe_deviation_angle_ = 20;
|
| -double
|
| - GestureConfiguration::max_touch_down_duration_in_seconds_for_click_ = 0.8;
|
| -double GestureConfiguration::max_touch_move_in_pixels_for_click_ = 15;
|
| -double GestureConfiguration::max_distance_between_taps_for_double_tap_ = 20;
|
| -double GestureConfiguration::min_distance_for_pinch_scroll_in_pixels_ = 20;
|
| -double GestureConfiguration::min_pinch_update_distance_in_pixels_ = 5;
|
| +int GestureConfiguration::max_touch_down_duration_for_click_in_ms_ = 800;
|
| +float GestureConfiguration::max_touch_move_in_pixels_for_click_ = 15;
|
| +float GestureConfiguration::max_distance_between_taps_for_double_tap_ = 20;
|
| +float GestureConfiguration::min_distance_for_pinch_scroll_in_pixels_ = 20;
|
| +float GestureConfiguration::min_pinch_update_distance_in_pixels_ = 5;
|
| float GestureConfiguration::min_scroll_velocity_ = 30.0f;
|
| -double GestureConfiguration::min_swipe_speed_ = 20;
|
| +float GestureConfiguration::min_swipe_speed_ = 20;
|
|
|
| // If this is too small, we currently can get single finger pinch zoom. See
|
| // crbug.com/357237 for details.
|
| -int GestureConfiguration::min_scaling_span_in_pixels_ = 125;
|
| +float GestureConfiguration::min_scaling_span_in_pixels_ = 125;
|
| int GestureConfiguration::show_press_delay_in_ms_ = 150;
|
|
|
| // TODO(jdduke): Disable and remove entirely when issues with intermittent
|
|
|