summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 18:10:21 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 18:10:21 +0000
commitb1b427f5d2867529aa7327a75b5d74a14a9d0ba5 (patch)
tree286db44f8a263aec2bc02df6f0b8e7e0ea8b6d7b /content
parent82d8f5d38f9389405a1ac84b1a35520d22ae0ee1 (diff)
downloadchromium_src-b1b427f5d2867529aa7327a75b5d74a14a9d0ba5.zip
chromium_src-b1b427f5d2867529aa7327a75b5d74a14a9d0ba5.tar.gz
chromium_src-b1b427f5d2867529aa7327a75b5d74a14a9d0ba5.tar.bz2
Revert 140553 - Add two finger tap gesture to gesture recognizer.
BUG=126058 TEST=none Review URL: https://chromiumcodereview.appspot.com/10447129 TBR=varunjain@chromium.org Review URL: https://chromiumcodereview.appspot.com/10541009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.cc6
-rw-r--r--content/browser/renderer_host/web_input_event_aurax11.cc3
2 files changed, 0 insertions, 9 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index ecd7d734..5b781f0 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -377,12 +377,6 @@ WebKit::WebInputEvent::Type ConvertToWebInputEvent(ui::EventType t) {
return WebKit::WebGestureEvent::GesturePinchEnd;
case ui::ET_GESTURE_PINCH_UPDATE:
return WebKit::WebGestureEvent::GesturePinchUpdate;
- case ui::ET_GESTURE_TAP_UP:
- return WebKit::WebGestureEvent::Undefined;
- case ui::ET_GESTURE_MULTIFINGER_SWIPE:
- return WebKit::WebGestureEvent::Undefined;
- case ui::ET_GESTURE_TWO_FINGER_TAP:
- return WebKit::WebGestureEvent::Undefined;
case ui::ET_TOUCH_PRESSED:
return WebKit::WebInputEvent::TouchStart;
case ui::ET_TOUCH_MOVED:
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index a103be1..a550dcb 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -365,9 +365,6 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
case ui::ET_GESTURE_LONG_PRESS:
gesture_event.type = WebKit::WebInputEvent::GestureLongPress;
break;
- case ui::ET_GESTURE_TWO_FINGER_TAP:
- gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap;
- break;
case ui::ET_GESTURE_TAP_UP:
case ui::ET_GESTURE_MULTIFINGER_SWIPE:
break;