1 files changed, 20 insertions, 9 deletions

diff --git a/chromium/ui/events/gestures/gesture_configuration.h b/chromium/ui/events/gestures/gesture_configuration.h
index a4bdcd3f4c2..08ce578eeeb 100644
--- a/chromium/ui/events/gestures/gesture_configuration.h
+++ b/chromium/ui/events/gestures/gesture_configuration.h
@@ -6,7 +6,7 @@
 #define UI_EVENTS_GESTURES_GESTURE_CONFIGURATION_H_
 
 #include "base/basictypes.h"
-#include "ui/events/events_export.h"
+#include "ui/events/events_base_export.h"
 
 namespace ui {
 
@@ -14,7 +14,7 @@ namespace ui {
 // approaches (windows, chrome, others).  This would turn into an
 // abstract base class.
 
-class EVENTS_EXPORT GestureConfiguration {
+class EVENTS_BASE_EXPORT GestureConfiguration {
  public:
   // Number of parameters in the array of parameters for the fling acceleration
   // curve.
@@ -125,12 +125,6 @@ class EVENTS_EXPORT GestureConfiguration {
   static void set_min_scroll_delta_squared(double val) {
     min_scroll_delta_squared_ = val;
   }
-  static int min_scroll_successive_velocity_events() {
-    return min_scroll_successive_velocity_events_;
-  }
-  static void set_min_scroll_successive_velocity_events(int val) {
-    min_scroll_successive_velocity_events_ = val;
-  }
   static float min_scroll_velocity() {
     return min_scroll_velocity_;
   }
@@ -149,6 +143,15 @@ class EVENTS_EXPORT GestureConfiguration {
   static void set_min_touch_down_duration_in_seconds_for_click(double val) {
     min_touch_down_duration_in_seconds_for_click_ = val;
   }
+
+  static int min_scaling_span_in_pixels() {
+    return min_scaling_span_in_pixels_;
+  };
+
+  static void set_min_scaling_span_in_pixels(int val) {
+    min_scaling_span_in_pixels_ = val;
+  }
+
   static int points_buffered_for_velocity() {
     return points_buffered_for_velocity_;
   }
@@ -179,6 +182,12 @@ class EVENTS_EXPORT GestureConfiguration {
   static int set_show_press_delay_in_ms(int val) {
     return show_press_delay_in_ms_ = val;
   }
+  static int scroll_debounce_interval_in_ms() {
+    return scroll_debounce_interval_in_ms_;
+  }
+  static int set_scroll_debounce_interval_in_ms(int val) {
+    return scroll_debounce_interval_in_ms_ = val;
+  }
   static void set_fling_acceleration_curve_coefficients(int i, float val) {
     fling_acceleration_curve_coefficients_[i] = val;
   }
@@ -238,15 +247,17 @@ class EVENTS_EXPORT GestureConfiguration {
   static double min_pinch_update_distance_in_pixels_;
   static double min_rail_break_velocity_;
   static double min_scroll_delta_squared_;
-  static int min_scroll_successive_velocity_events_;
   static float min_scroll_velocity_;
   static double min_swipe_speed_;
   static double min_touch_down_duration_in_seconds_for_click_;
+  static int min_scaling_span_in_pixels_;
   static int points_buffered_for_velocity_;
   static double rail_break_proportion_;
   static double rail_start_proportion_;
   static double scroll_prediction_seconds_;
   static int show_press_delay_in_ms_;
+  static int scroll_debounce_interval_in_ms_;
+
   static float fling_acceleration_curve_coefficients_[NumAccelParams];
   static float fling_velocity_cap_;
   // TODO(davemoore): Move into chrome/browser/ui.