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 e27a14883b96e2a9268195e3b51d6a045ee54f26..a8c96811359c985a8ef25d2807db94efeb735026 100644 |
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc |
@@ -74,6 +74,8 @@ const char* kPrefsToObserve[] = { |
prefs::kFlingAccelerationCurveCoefficient1, |
prefs::kFlingAccelerationCurveCoefficient2, |
prefs::kFlingAccelerationCurveCoefficient3, |
+ prefs::kFlingMaxCancelToDownTimeInMs, |
+ prefs::kFlingMaxTapGapTimeInMs, |
prefs::kFlingVelocityCap, |
prefs::kLongPressTimeInSeconds, |
prefs::kMaxDistanceForTwoFingerTapInPixels, |
@@ -130,6 +132,10 @@ void GesturePrefsObserver::Update() { |
prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient2)); |
GestureConfiguration::set_fling_acceleration_curve_coefficients(3, |
prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient3)); |
+ GestureConfiguration::set_fling_max_cancel_to_down_time_in_ms( |
+ prefs_->GetInteger(prefs::kFlingMaxCancelToDownTimeInMs)); |
+ GestureConfiguration::set_fling_max_tap_gap_time_in_ms( |
+ prefs_->GetInteger(prefs::kFlingMaxTapGapTimeInMs)); |
GestureConfiguration::set_fling_velocity_cap( |
prefs_->GetDouble(prefs::kFlingVelocityCap)); |
GestureConfiguration::set_long_press_time_in_seconds( |
@@ -252,6 +258,14 @@ void GesturePrefsObserverFactoryAura::RegisterUserPrefs( |
prefs::kFlingAccelerationCurveCoefficient3, |
GestureConfiguration::fling_acceleration_curve_coefficients(3), |
PrefServiceSyncable::UNSYNCABLE_PREF); |
+ prefs->RegisterIntegerPref( |
+ prefs::kFlingMaxCancelToDownTimeInMs, |
+ GestureConfiguration::fling_max_cancel_to_down_time_in_ms(), |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
+ prefs->RegisterIntegerPref( |
+ prefs::kFlingMaxTapGapTimeInMs, |
+ GestureConfiguration::fling_max_tap_gap_time_in_ms(), |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterDoublePref( |
prefs::kFlingVelocityCap, |
GestureConfiguration::fling_velocity_cap(), |