diff options
| author | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 01:04:46 +0000 |
|---|---|---|
| committer | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 01:04:46 +0000 |
| commit | 2b67b769471bcaa8d3582118238b2bbfb791a16a (patch) | |
| tree | 30b14d27c5d4ef9092d4f8e1803f55945c0f33d4 /ui/base | |
| parent | 289976353db405578421190cfea4585eb87c34a3 (diff) | |
| download | chromium_src-2b67b769471bcaa8d3582118238b2bbfb791a16a.zip chromium_src-2b67b769471bcaa8d3582118238b2bbfb791a16a.tar.gz chromium_src-2b67b769471bcaa8d3582118238b2bbfb791a16a.tar.bz2 | |
Replace ET_GESTURE_DOUBLE_TAP with ET_GESTURE_TAP
ET_GESTURE_TAP now has a tap count memeber to tell if it
is a single or double tap. So replace the usage of
ET_GESTURE_DOUBLE_TAP with ET_GESTURE_TAP.
BUG=140382
Review URL: https://chromiumcodereview.appspot.com/12745006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/events/event.cc | 1 | ||||
| -rw-r--r-- | ui/base/events/event.h | 1 | ||||
| -rw-r--r-- | ui/base/events/event_constants.h | 1 | ||||
| -rw-r--r-- | ui/base/gestures/gesture_sequence.cc | 12 |
4 files changed, 0 insertions, 15 deletions
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc index 9588076..b593259 100644 --- a/ui/base/events/event.cc +++ b/ui/base/events/event.cc @@ -84,7 +84,6 @@ std::string EventTypeName(ui::EventType type) { CASE_TYPE(ET_GESTURE_TAP_CANCEL); CASE_TYPE(ET_GESTURE_BEGIN); CASE_TYPE(ET_GESTURE_END); - CASE_TYPE(ET_GESTURE_DOUBLE_TAP); CASE_TYPE(ET_GESTURE_TWO_FINGER_TAP); CASE_TYPE(ET_GESTURE_PINCH_BEGIN); CASE_TYPE(ET_GESTURE_PINCH_END); diff --git a/ui/base/events/event.h b/ui/base/events/event.h index b29d1ed..a61d5dc 100644 --- a/ui/base/events/event.h +++ b/ui/base/events/event.h @@ -129,7 +129,6 @@ class UI_EXPORT Event { case ET_GESTURE_TAP_DOWN: case ET_GESTURE_BEGIN: case ET_GESTURE_END: - case ET_GESTURE_DOUBLE_TAP: case ET_GESTURE_TWO_FINGER_TAP: case ET_GESTURE_PINCH_BEGIN: case ET_GESTURE_PINCH_END: diff --git a/ui/base/events/event_constants.h b/ui/base/events/event_constants.h index bb7706d..c08142f 100644 --- a/ui/base/events/event_constants.h +++ b/ui/base/events/event_constants.h @@ -38,7 +38,6 @@ enum EventType { ET_GESTURE_TAP_CANCEL, ET_GESTURE_BEGIN, // Sent before any other gesture types. ET_GESTURE_END, // Sent after any other gestures. - ET_GESTURE_DOUBLE_TAP, ET_GESTURE_TWO_FINGER_TAP, ET_GESTURE_PINCH_BEGIN, ET_GESTURE_PINCH_END, diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index a08feae..cc4dca5 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -678,16 +678,6 @@ void GestureSequence::AppendClickGestureEvent(const GesturePoint& point, 1 << point.touch_id())); } -void GestureSequence::AppendDoubleClickGestureEvent(const GesturePoint& point, - Gestures* gestures) { - gestures->push_back(CreateGestureEvent( - GestureEventDetails(ui::ET_GESTURE_DOUBLE_TAP, 0, 0), - point.first_touch_position(), - flags_, - base::Time::FromDoubleT(point.last_touch_time()), - 1 << point.touch_id())); -} - void GestureSequence::AppendScrollGestureBegin(const GesturePoint& point, const gfx::Point& location, Gestures* gestures) { @@ -833,8 +823,6 @@ bool GestureSequence::Click(const TouchEvent& event, if (point.IsInClickWindow(event)) { bool double_tap = point.IsInDoubleClickWindow(event); AppendClickGestureEvent(point, double_tap ? 2 : 1, gestures); - if (double_tap) - AppendDoubleClickGestureEvent(point, gestures); return true; } else if (point.IsInsideManhattanSquare(event) && !GetLongPressTimer()->IsRunning()) { |