Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: ui/events/gestures/gesture_configuration.cc

Issue 630003003: Change GestureConfiguration types to be consistent with each other and with the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix compile Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/events/gestures/gesture_configuration.h ('k') | ui/events/gestures/gesture_provider_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/gestures/gesture_configuration.h" 5 #include "ui/events/gestures/gesture_configuration.h"
6 6
7 namespace ui { 7 namespace ui {
8 8
9 int GestureConfiguration::default_radius_ = 25; 9 float GestureConfiguration::default_radius_ = 25;
10 int GestureConfiguration::fling_max_cancel_to_down_time_in_ms_ = 400; 10 int GestureConfiguration::fling_max_cancel_to_down_time_in_ms_ = 400;
11 int GestureConfiguration::fling_max_tap_gap_time_in_ms_ = 200; 11 int GestureConfiguration::fling_max_tap_gap_time_in_ms_ = 200;
12 float GestureConfiguration::fling_velocity_cap_ = 17000.0f; 12 float GestureConfiguration::fling_velocity_cap_ = 17000.0f;
13 int GestureConfiguration::tab_scrub_activation_delay_in_ms_ = 200; 13 int GestureConfiguration::tab_scrub_activation_delay_in_ms_ = 200;
14 double GestureConfiguration::long_press_time_in_seconds_ = 1.0; 14 int GestureConfiguration::long_press_time_in_ms_ = 1000;
15 double GestureConfiguration::semi_long_press_time_in_seconds_ = 0.4; 15 int GestureConfiguration::semi_long_press_time_in_ms_ = 400;
16 double GestureConfiguration::max_distance_for_two_finger_tap_in_pixels_ = 300; 16 float GestureConfiguration::max_distance_for_two_finger_tap_in_pixels_ = 300;
17 double GestureConfiguration::max_seconds_between_double_click_ = 0.7; 17 int GestureConfiguration::max_time_between_double_click_in_ms_ = 700;
18 double 18 float GestureConfiguration::max_separation_for_gesture_touches_in_pixels_ = 150;
19 GestureConfiguration::max_separation_for_gesture_touches_in_pixels_ = 150;
20 float GestureConfiguration::max_swipe_deviation_angle_ = 20; 19 float GestureConfiguration::max_swipe_deviation_angle_ = 20;
21 double 20 int GestureConfiguration::max_touch_down_duration_for_click_in_ms_ = 800;
22 GestureConfiguration::max_touch_down_duration_in_seconds_for_click_ = 0.8; 21 float GestureConfiguration::max_touch_move_in_pixels_for_click_ = 15;
23 double GestureConfiguration::max_touch_move_in_pixels_for_click_ = 15; 22 float GestureConfiguration::max_distance_between_taps_for_double_tap_ = 20;
24 double GestureConfiguration::max_distance_between_taps_for_double_tap_ = 20; 23 float GestureConfiguration::min_distance_for_pinch_scroll_in_pixels_ = 20;
25 double GestureConfiguration::min_distance_for_pinch_scroll_in_pixels_ = 20; 24 float GestureConfiguration::min_pinch_update_distance_in_pixels_ = 5;
26 double GestureConfiguration::min_pinch_update_distance_in_pixels_ = 5;
27 float GestureConfiguration::min_scroll_velocity_ = 30.0f; 25 float GestureConfiguration::min_scroll_velocity_ = 30.0f;
28 double GestureConfiguration::min_swipe_speed_ = 20; 26 float GestureConfiguration::min_swipe_speed_ = 20;
29 27
30 // If this is too small, we currently can get single finger pinch zoom. See 28 // If this is too small, we currently can get single finger pinch zoom. See
31 // crbug.com/357237 for details. 29 // crbug.com/357237 for details.
32 int GestureConfiguration::min_scaling_span_in_pixels_ = 125; 30 float GestureConfiguration::min_scaling_span_in_pixels_ = 125;
33 int GestureConfiguration::show_press_delay_in_ms_ = 150; 31 int GestureConfiguration::show_press_delay_in_ms_ = 150;
34 32
35 // TODO(jdduke): Disable and remove entirely when issues with intermittent 33 // TODO(jdduke): Disable and remove entirely when issues with intermittent
36 // scroll end detection on the Pixel are resolved, crbug.com/353702. 34 // scroll end detection on the Pixel are resolved, crbug.com/353702.
37 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
38 int GestureConfiguration::scroll_debounce_interval_in_ms_ = 30; 36 int GestureConfiguration::scroll_debounce_interval_in_ms_ = 30;
39 #else 37 #else
40 int GestureConfiguration::scroll_debounce_interval_in_ms_ = 0; 38 int GestureConfiguration::scroll_debounce_interval_in_ms_ = 0;
41 #endif 39 #endif
42 40
43 } // namespace ui 41 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/gestures/gesture_configuration.h ('k') | ui/events/gestures/gesture_provider_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698