OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef UI_AURA_GESTURES_GESTURE_POINT_H_ | 5 #ifndef UI_AURA_GESTURES_GESTURE_POINT_H_ |
6 #define UI_AURA_GESTURES_GESTURE_POINT_H_ | 6 #define UI_AURA_GESTURES_GESTURE_POINT_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "ui/aura/gestures/velocity_calculator.h" |
10 #include "ui/gfx/point.h" | 11 #include "ui/gfx/point.h" |
11 | 12 |
12 namespace aura { | 13 namespace aura { |
13 class TouchEvent; | 14 class TouchEvent; |
14 | 15 |
15 // Gesture state. | 16 // Gesture state. |
16 enum GestureState { | 17 enum GestureState { |
17 GS_NO_GESTURE, | 18 GS_NO_GESTURE, |
18 GS_PENDING_SYNTHETIC_CLICK, | 19 GS_PENDING_SYNTHETIC_CLICK, |
19 GS_SCROLL, | 20 GS_SCROLL, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 double first_touch_time_; | 78 double first_touch_time_; |
78 gfx::Point last_touch_position_; | 79 gfx::Point last_touch_position_; |
79 double last_touch_time_; | 80 double last_touch_time_; |
80 | 81 |
81 double last_tap_time_; | 82 double last_tap_time_; |
82 gfx::Point last_tap_position_; | 83 gfx::Point last_tap_position_; |
83 | 84 |
84 float x_velocity_; | 85 float x_velocity_; |
85 float y_velocity_; | 86 float y_velocity_; |
86 | 87 |
| 88 VelocityCalculator velocity_calculator_; |
| 89 |
87 DISALLOW_COPY_AND_ASSIGN(GesturePoint); | 90 DISALLOW_COPY_AND_ASSIGN(GesturePoint); |
88 }; | 91 }; |
89 | 92 |
90 } // namespace aura | 93 } // namespace aura |
91 | 94 |
92 #endif // UI_AURA_GESTURES_GESTURE_POINT_H_ | 95 #endif // UI_AURA_GESTURES_GESTURE_POINT_H_ |
OLD | NEW |