Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/gesture_detection/gesture_detector.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ skipping 50 matching lines @@
 
     // Whether |OnTwoFingerTap| should be called for two finger tap
     // gestures. Defaults to false.
     bool two_finger_tap_enabled;
 
     // Maximum distance between pointers for a two finger tap.
     float two_finger_tap_max_separation;
 
     // Maximum time the second pointer can be active for a two finger tap.
     base::TimeDelta two_finger_tap_timeout;
+
+    VelocityTracker::Strategy velocity_tracker_strategy;
   };
 
   GestureDetector(const Config& config,
                   GestureListener* listener,
                   DoubleTapListener* optional_double_tap_listener);
   ~GestureDetector();
 
   bool OnTouchEvent(const MotionEvent& ev);
 
   // Setting a valid |double_tap_listener| will enable double-tap detection,
@@ skipping 63 matching lines @@
 
   // Determines speed during touch scrolling.
   VelocityTrackerState velocity_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureDetector);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_