OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/gesture_detection/gesture_configuration.h" | 5 #include "ui/events/gesture_detection/gesture_configuration.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "ui/events/event_switches.h" | 9 #include "ui/events/event_switches.h" |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 set_min_pinch_update_span_delta( | 29 set_min_pinch_update_span_delta( |
30 base::CommandLine::ForCurrentProcess()->HasSwitch( | 30 base::CommandLine::ForCurrentProcess()->HasSwitch( |
31 switches::kCompensateForUnstablePinchZoom) | 31 switches::kCompensateForUnstablePinchZoom) |
32 ? 5 | 32 ? 5 |
33 : 0); | 33 : 0); |
34 set_min_scaling_touch_major(default_radius() * 2); | 34 set_min_scaling_touch_major(default_radius() * 2); |
35 set_velocity_tracker_strategy(VelocityTracker::Strategy::LSQ2_RESTRICTED); | 35 set_velocity_tracker_strategy(VelocityTracker::Strategy::LSQ2_RESTRICTED); |
36 set_span_slop(max_touch_move_in_pixels_for_click() * 2); | 36 set_span_slop(max_touch_move_in_pixels_for_click() * 2); |
37 set_swipe_enabled(true); | 37 set_swipe_enabled(true); |
38 set_two_finger_tap_enabled(true); | 38 set_two_finger_tap_enabled(true); |
| 39 set_fling_touchpad_tap_suppression_enabled(true); |
| 40 set_fling_touchscreen_tap_suppression_enabled(true); |
39 } | 41 } |
40 | 42 |
41 friend struct DefaultSingletonTraits<GestureConfigurationAura>; | 43 friend struct DefaultSingletonTraits<GestureConfigurationAura>; |
42 DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAura); | 44 DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAura); |
43 }; | 45 }; |
44 | 46 |
45 } // namespace | 47 } // namespace |
46 | 48 |
47 // Create a GestureConfigurationAura singleton instance when using aura. | 49 // Create a GestureConfigurationAura singleton instance when using aura. |
48 GestureConfiguration* GestureConfiguration::GetPlatformSpecificInstance() { | 50 GestureConfiguration* GestureConfiguration::GetPlatformSpecificInstance() { |
49 return GestureConfigurationAura::GetInstance(); | 51 return GestureConfigurationAura::GetInstance(); |
50 } | 52 } |
51 | 53 |
52 } // namespace ui | 54 } // namespace ui |
OLD | NEW |