| 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 cb67b4b54e525664b5efa2bf3cea036dcb18339c..f4bd0776f0cf6d448789854b641e8184ef2a59a7 100644
|
| --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| @@ -122,18 +122,12 @@ const char* kPrefsToObserve[] = {
|
| prefs::kRailBreakProportion,
|
| prefs::kRailStartProportion,
|
| prefs::kSemiLongPressTimeInSeconds,
|
| -};
|
| -
|
| -const char* kFlingTouchpadPrefs[] = {
|
| prefs::kFlingCurveTouchpadAlpha,
|
| prefs::kFlingCurveTouchpadBeta,
|
| - prefs::kFlingCurveTouchpadGamma
|
| -};
|
| -
|
| -const char* kFlingTouchscreenPrefs[] = {
|
| + prefs::kFlingCurveTouchpadGamma,
|
| prefs::kFlingCurveTouchscreenAlpha,
|
| prefs::kFlingCurveTouchscreenBeta,
|
| - prefs::kFlingCurveTouchscreenGamma,
|
| + prefs::kFlingCurveTouchscreenGamma
|
| };
|
|
|
| GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
|
| @@ -152,12 +146,6 @@ GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
|
| for (size_t i = 0; i < overscroll_prefs.size(); ++i)
|
| prefs->ClearPref(overscroll_prefs[i].pref_name);
|
|
|
| - for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); ++i)
|
| - prefs->ClearPref(kFlingTouchpadPrefs[i]);
|
| -
|
| - for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); ++i)
|
| - prefs->ClearPref(kFlingTouchscreenPrefs[i]);
|
| -
|
| prefs->SetBoolean(prefs::kGestureConfigIsTrustworthy, true);
|
| }
|
|
|
| @@ -176,11 +164,6 @@ GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
|
| for (size_t i = 0; i < overscroll_prefs.size(); ++i)
|
| registrar_.Add(overscroll_prefs[i].pref_name, callback);
|
|
|
| - for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); ++i)
|
| - registrar_.Add(kFlingTouchpadPrefs[i], notify_callback);
|
| - for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); ++i)
|
| - registrar_.Add(kFlingTouchscreenPrefs[i], notify_callback);
|
| -
|
| Update();
|
| }
|
|
|
| @@ -272,6 +255,22 @@ void GesturePrefsObserver::Update() {
|
| GestureConfiguration::set_show_press_delay_in_ms(
|
| prefs_->GetInteger(prefs::kShowPressDelayInMS));
|
|
|
| + // Fling curve: Touchpad
|
| + GestureConfiguration::set_touchpad_fling_curve_alpha(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchpadAlpha));
|
| + GestureConfiguration::set_touchpad_fling_curve_beta(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchpadBeta));
|
| + GestureConfiguration::set_touchpad_fling_curve_gamma(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchpadGamma));
|
| +
|
| + // Fling curve: Touchscreen
|
| + GestureConfiguration::set_touchscreen_fling_curve_alpha(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchscreenAlpha));
|
| + GestureConfiguration::set_touchscreen_fling_curve_beta(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchscreenBeta));
|
| + GestureConfiguration::set_touchscreen_fling_curve_gamma(
|
| + prefs_->GetDouble(prefs::kFlingCurveTouchscreenGamma));
|
| +
|
| UpdateOverscrollPrefs();
|
| }
|
|
|
| @@ -329,17 +328,33 @@ void GesturePrefsObserverFactoryAura::RegisterFlingCurveParameters(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| content::RendererPreferences def_prefs;
|
|
|
| - for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); i++)
|
| - registry->RegisterDoublePref(
|
| - kFlingTouchpadPrefs[i],
|
| - def_prefs.touchpad_fling_profile[i],
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + // Touchpad
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchpadAlpha,
|
| + GestureConfiguration::touchpad_fling_curve_alpha(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchpadBeta,
|
| + GestureConfiguration::touchpad_fling_curve_beta(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchpadGamma,
|
| + GestureConfiguration::touchpad_fling_curve_gamma(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
|
|
| - for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); i++)
|
| - registry->RegisterDoublePref(
|
| - kFlingTouchscreenPrefs[i],
|
| - def_prefs.touchscreen_fling_profile[i],
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + // Touchscreen
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchscreenAlpha,
|
| + GestureConfiguration::touchscreen_fling_curve_alpha(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchscreenBeta,
|
| + GestureConfiguration::touchscreen_fling_curve_beta(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDoublePref(
|
| + prefs::kFlingCurveTouchscreenGamma,
|
| + GestureConfiguration::touchscreen_fling_curve_gamma(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| void GesturePrefsObserverFactoryAura::RegisterProfilePrefs(
|
|
|