Reland Unified Gesture Recognizer for Aura

ui/events/gestures/gesture_configuration.h

 // Copyright (c) 2013 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_GESTURES_GESTURE_CONFIGURATION_H_
 #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 {
 
 // TODO: Expand this design to support multiple OS configuration
 // 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.
   static const int NumAccelParams = 4;
 
   // Ordered alphabetically ignoring underscores, to align with the
   // associated list of prefs in gesture_prefs_aura.cc.
   static int default_radius() {
     return default_radius_;
   }
@@ skipping 108 matching lines @@
   }
   static void set_min_swipe_speed(double val) {
     min_swipe_speed_ = val;
   }
   static double min_touch_down_duration_in_seconds_for_click() {
     return min_touch_down_duration_in_seconds_for_click_;
   }
   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_;
   }
   static void set_points_buffered_for_velocity(int val) {
     points_buffered_for_velocity_ = val;
   }
   static double rail_break_proportion() {
     return rail_break_proportion_;
   }
   static void set_rail_break_proportion(double val) {
@@ skipping 72 matching lines @@
   static double max_touch_move_in_pixels_for_click_;
   static double max_distance_between_taps_for_double_tap_;
   static double min_distance_for_pinch_scroll_in_pixels_;
   static double min_flick_speed_squared_;
   static double min_pinch_update_distance_in_pixels_;
   static double min_rail_break_velocity_;
   static double min_scroll_delta_squared_;
   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 float fling_acceleration_curve_coefficients_[NumAccelParams];
   static float fling_velocity_cap_;
   // TODO(davemoore): Move into chrome/browser/ui.
   static int tab_scrub_activation_delay_in_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureConfiguration);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_GESTURES_GESTURE_CONFIGURATION_H_