Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 729533003: Remove GestureScrollUpdateWithoutPropagation event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove hard count from the test Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "content/browser/android/content_view_core_impl.h" 5 #include "content/browser/android/content_view_core_impl.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 return GESTURE_EVENT_TYPE_LONG_PRESS; 140 return GESTURE_EVENT_TYPE_LONG_PRESS;
141 case WebInputEvent::GestureLongTap: 141 case WebInputEvent::GestureLongTap:
142 return GESTURE_EVENT_TYPE_LONG_TAP; 142 return GESTURE_EVENT_TYPE_LONG_TAP;
143 case WebInputEvent::GesturePinchBegin: 143 case WebInputEvent::GesturePinchBegin:
144 return GESTURE_EVENT_TYPE_PINCH_BEGIN; 144 return GESTURE_EVENT_TYPE_PINCH_BEGIN;
145 case WebInputEvent::GesturePinchEnd: 145 case WebInputEvent::GesturePinchEnd:
146 return GESTURE_EVENT_TYPE_PINCH_END; 146 return GESTURE_EVENT_TYPE_PINCH_END;
147 case WebInputEvent::GesturePinchUpdate: 147 case WebInputEvent::GesturePinchUpdate:
148 return GESTURE_EVENT_TYPE_PINCH_BY; 148 return GESTURE_EVENT_TYPE_PINCH_BY;
149 case WebInputEvent::GestureTwoFingerTap: 149 case WebInputEvent::GestureTwoFingerTap:
150 case WebInputEvent::GestureScrollUpdateWithoutPropagation:
151 default: 150 default:
152 NOTREACHED() << "Invalid source gesture type: " 151 NOTREACHED() << "Invalid source gesture type: "
153 << WebInputEventTraits::GetName(type); 152 << WebInputEventTraits::GetName(type);
154 return -1; 153 return -1;
155 }; 154 };
156 } 155 }
157 156
158 float GetPrimaryDisplayDeviceScaleFactor() { 157 float GetPrimaryDisplayDeviceScaleFactor() {
159 const gfx::Display& display = 158 const gfx::Display& display =
160 gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); 159 gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 reinterpret_cast<ui::WindowAndroid*>(window_android), 1338 reinterpret_cast<ui::WindowAndroid*>(window_android),
1340 retained_objects_set); 1339 retained_objects_set);
1341 return reinterpret_cast<intptr_t>(view); 1340 return reinterpret_cast<intptr_t>(view);
1342 } 1341 }
1343 1342
1344 bool RegisterContentViewCore(JNIEnv* env) { 1343 bool RegisterContentViewCore(JNIEnv* env) {
1345 return RegisterNativesImpl(env); 1344 return RegisterNativesImpl(env);
1346 } 1345 }
1347 1346
1348 } // namespace content 1347 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698