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

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed desired #include Created 6 years, 7 months 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index b3cd30bfbffa2db0eefcb2ec2419c1b6033a6ec2..355671be1867b9c868fb8fe3261ec893a73a05ae 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -2496,7 +2496,7 @@ TEST_F(WebContentsImplTest, HandleGestureEvent) {
const float kZoomStepValue = 0.6f;
blink::WebGestureEvent event = SyntheticWebGestureEventBuilder::Build(
- WebInputEvent::GesturePinchUpdate, WebGestureEvent::Touchpad);
+ WebInputEvent::GesturePinchUpdate, blink::WebGestureDeviceTouchpad);
// A pinch less than the step value doesn't change the zoom level.
event.data.pinchUpdate.scale = 1.0f + kZoomStepValue * 0.8f;
@@ -2526,7 +2526,7 @@ TEST_F(WebContentsImplTest, HandleGestureEvent) {
// No other type of gesture event is handled by WebContentsImpl (for example
// a touchscreen pinch gesture).
event = SyntheticWebGestureEventBuilder::Build(
- WebInputEvent::GesturePinchUpdate, WebGestureEvent::Touchscreen);
+ WebInputEvent::GesturePinchUpdate, blink::WebGestureDeviceTouchpad);
event.data.pinchUpdate.scale = 1.0f + kZoomStepValue * 3;
EXPECT_FALSE(contents()->HandleGestureEvent(event));
EXPECT_EQ(0, delegate->GetAndResetContentsZoomChangedCallCount());

Powered by Google App Engine
This is Rietveld 408576698