| Index: ui/events/gestures/gesture_configuration.h
|
| diff --git a/ui/events/gestures/gesture_configuration.h b/ui/events/gestures/gesture_configuration.h
|
| index f121b75d8db84a7a3f31b4e98e066071faa4973c..1338e1d2b5e311f1ac44881c0fe60c36f3e59d42 100644
|
| --- a/ui/events/gestures/gesture_configuration.h
|
| +++ b/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_base_export.h"
|
| +#include "ui/events/events_export.h"
|
|
|
| namespace ui {
|
|
|
| @@ -14,7 +14,7 @@
|
| // approaches (windows, chrome, others). This would turn into an
|
| // abstract base class.
|
|
|
| -class EVENTS_BASE_EXPORT GestureConfiguration {
|
| +class EVENTS_EXPORT GestureConfiguration {
|
| public:
|
| // Number of parameters in the array of parameters for the fling acceleration
|
| // curve.
|
| @@ -143,15 +143,6 @@
|
| 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_;
|
| }
|
| @@ -244,7 +235,6 @@
|
| 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_;
|
|
|