| 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 "ui/events/event_switches.h" | 8 #include "ui/events/event_switches.h" |
| 9 | 9 |
| 10 namespace ui { | 10 namespace ui { |
| 11 namespace { | 11 namespace { |
| 12 | 12 |
| 13 class GestureConfigurationAura : public GestureConfiguration { | 13 class GestureConfigurationAura : public GestureConfiguration { |
| 14 public: | 14 public: |
| 15 ~GestureConfigurationAura() override { | 15 ~GestureConfigurationAura() override { |
| 16 } | 16 } |
| 17 | 17 |
| 18 static GestureConfigurationAura* GetInstance() { | 18 static GestureConfigurationAura* GetInstance() { |
| 19 return Singleton<GestureConfigurationAura>::get(); | 19 return Singleton<GestureConfigurationAura>::get(); |
| 20 } | 20 } |
| 21 | 21 |
| 22 private: | 22 private: |
| 23 GestureConfigurationAura() : GestureConfiguration() { | 23 GestureConfigurationAura() : GestureConfiguration() { |
| 24 set_double_tap_enabled(false); |
| 24 set_double_tap_timeout_in_ms(semi_long_press_time_in_ms()); | 25 set_double_tap_timeout_in_ms(semi_long_press_time_in_ms()); |
| 25 set_gesture_begin_end_types_enabled(true); | 26 set_gesture_begin_end_types_enabled(true); |
| 26 set_min_gesture_bounds_length(default_radius()); | 27 set_min_gesture_bounds_length(default_radius()); |
| 27 set_min_pinch_update_span_delta( | 28 set_min_pinch_update_span_delta( |
| 28 base::CommandLine::ForCurrentProcess()->HasSwitch( | 29 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 29 switches::kCompensateForUnstablePinchZoom) | 30 switches::kCompensateForUnstablePinchZoom) |
| 30 ? 5 | 31 ? 5 |
| 31 : 0); | 32 : 0); |
| 32 set_min_scaling_touch_major(default_radius() * 2); | 33 set_min_scaling_touch_major(default_radius() * 2); |
| 33 set_velocity_tracker_strategy(VelocityTracker::Strategy::LSQ2_RESTRICTED); | 34 set_velocity_tracker_strategy(VelocityTracker::Strategy::LSQ2_RESTRICTED); |
| 34 set_span_slop(max_touch_move_in_pixels_for_click() * 2); | 35 set_span_slop(max_touch_move_in_pixels_for_click() * 2); |
| 35 set_swipe_enabled(true); | 36 set_swipe_enabled(true); |
| 36 set_two_finger_tap_enabled(true); | 37 set_two_finger_tap_enabled(true); |
| 37 } | 38 } |
| 38 | 39 |
| 39 friend struct DefaultSingletonTraits<GestureConfigurationAura>; | 40 friend struct DefaultSingletonTraits<GestureConfigurationAura>; |
| 40 DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAura); | 41 DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAura); |
| 41 }; | 42 }; |
| 42 | 43 |
| 43 } // namespace | 44 } // namespace |
| 44 | 45 |
| 45 // Create a GestureConfigurationAura singleton instance when using aura. | 46 // Create a GestureConfigurationAura singleton instance when using aura. |
| 46 GestureConfiguration* GestureConfiguration::GetInstance() { | 47 GestureConfiguration* GestureConfiguration::GetInstance() { |
| 47 return GestureConfigurationAura::GetInstance(); | 48 return GestureConfigurationAura::GetInstance(); |
| 48 } | 49 } |
| 49 | 50 |
| 50 } // namespace ui | 51 } // namespace ui |
| OLD | NEW |