Index: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
index 091460ef4234cb050aadeb19ebb69f2306df5a82..3163ef07864fc82c9cb67f07569530cc50af549a 100644 |
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
@@ -27,48 +27,6 @@ using ui::GestureConfiguration; |
namespace { |
-// TODO(tdresser): Remove these deprecated prefs in M38. See crbug.com/379912. |
- |
-const char kFlingVelocityCap[] = "gesture.fling_velocity_cap"; |
-const char kLongPressTimeInSeconds[] = |
- "gesture.long_press_time_in_seconds"; |
-const char kMaxDistanceBetweenTapsForDoubleTap[] = |
- "gesture.max_distance_between_taps_for_double_tap"; |
-const char kMaxDistanceForTwoFingerTapInPixels[] = |
- "gesture.max_distance_for_two_finger_tap_in_pixels"; |
-const char kMaxSecondsBetweenDoubleClick[] = |
- "gesture.max_seconds_between_double_click"; |
-const char kMaxSwipeDeviationRatio[] = |
- "gesture.max_swipe_deviation_ratio"; |
-const char kMaxTouchDownDurationInSecondsForClick[] = |
- "gesture.max_touch_down_duration_in_seconds_for_click"; |
-const char kMaxTouchMoveInPixelsForClick[] = |
- "gesture.max_touch_move_in_pixels_for_click"; |
-const char kMinDistanceForPinchScrollInPixels[] = |
- "gesture.min_distance_for_pinch_scroll_in_pixels"; |
-const char kMinFlickSpeedSquared[] = |
- "gesture.min_flick_speed_squared"; |
-const char kMinPinchUpdateDistanceInPixels[] = |
- "gesture.min_pinch_update_distance_in_pixels"; |
-const char kMinRailBreakVelocity[] = |
- "gesture.min_rail_break_velocity"; |
-const char kMinScrollDeltaSquared[] = |
- "gesture.min_scroll_delta_squared"; |
-const char kMinSwipeSpeed[] = |
- "gesture.min_swipe_speed"; |
-const char kMinTouchDownDurationInSecondsForClick[] = |
- "gesture.min_touch_down_duration_in_seconds_for_click"; |
-const char kPointsBufferedForVelocity[] = |
- "gesture.points_buffered_for_velocity"; |
-const char kRailBreakProportion[] = |
- "gesture.rail_break_proportion"; |
-const char kRailStartProportion[] = |
- "gesture.rail_start_proportion"; |
-const char kScrollPredictionSeconds[] = |
- "gesture.scroll_prediction_seconds"; |
-const char kShowPressDelayInMS[] = |
- "gesture.show_press_delay_in_ms"; |
- |
struct OverscrollPref { |
const char* pref_name; |
content::OverscrollConfig config; |
@@ -156,37 +114,8 @@ const char* kFlingTouchscreenPrefs[] = { |
prefs::kFlingCurveTouchscreenGamma, |
}; |
-const char* kPrefsToRemove[] = { |
- kFlingVelocityCap, |
- kLongPressTimeInSeconds, |
- kMaxDistanceBetweenTapsForDoubleTap, |
- kMaxDistanceForTwoFingerTapInPixels, |
- kMaxSecondsBetweenDoubleClick, |
- kMaxSwipeDeviationRatio, |
- kMaxTouchDownDurationInSecondsForClick, |
- kMaxTouchMoveInPixelsForClick, |
- kMinDistanceForPinchScrollInPixels, |
- kMinFlickSpeedSquared, |
- kMinPinchUpdateDistanceInPixels, |
- kMinRailBreakVelocity, |
- kMinScrollDeltaSquared, |
- kMinSwipeSpeed, |
- kMinTouchDownDurationInSecondsForClick, |
- kPointsBufferedForVelocity, |
- kRailBreakProportion, |
- kRailStartProportion, |
- kScrollPredictionSeconds, |
- kShowPressDelayInMS, |
-}; |
- |
GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs) |
: prefs_(prefs) { |
- // Clear for migration. |
- for (size_t i = 0; i < arraysize(kPrefsToRemove); ++i) { |
- if (prefs->FindPreference(kPrefsToRemove[i])) |
- prefs->ClearPref(kPrefsToRemove[i]); |
- } |
- |
registrar_.Init(prefs); |
registrar_.RemoveAll(); |
base::Closure callback = base::Bind(&GesturePrefsObserver::Update, |