Remove fling curve profiles from renderer preferences assuming that be turn on

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

 // 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.
 
 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 117 matching lines @@
   prefs::kMinPinchUpdateDistanceInPixels,
   prefs::kMinRailBreakVelocity,
   prefs::kMinScrollDeltaSquared,
   prefs::kMinScrollSuccessiveVelocityEvents,
   prefs::kMinSwipeSpeed,
   prefs::kMinTouchDownDurationInSecondsForClick,
   prefs::kPointsBufferedForVelocity,
   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)
     : prefs_(prefs) {
   // Clear for migration.
   prefs->ClearPref(kTouchScreenFlingAccelerationAdjustment);
 
   // TODO(mohsen): Remove following code in M32. By then, gesture prefs will
   // have been cleared for majority of the users: crbug.com/269292.
   // Do a one-time wipe of all gesture preferences.
   if (!prefs->GetBoolean(prefs::kGestureConfigIsTrustworthy)) {
     for (size_t i = 0; i < arraysize(kPrefsToObserve); ++i)
       prefs->ClearPref(kPrefsToObserve[i]);
 
     const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
     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]);
-
 #if defined(USE_ASH)
     for (size_t i = 0; i < arraysize(kImmersiveModePrefs); ++i)
       prefs->ClearPref(kImmersiveModePrefs[i]);
 #endif  // USE_ASH
 
     prefs->SetBoolean(prefs::kGestureConfigIsTrustworthy, true);
   }
 
   registrar_.Init(prefs);
   registrar_.RemoveAll();
   base::Closure callback = base::Bind(&GesturePrefsObserver::Update,
                                       base::Unretained(this));
 
   base::Closure notify_callback = base::Bind(&GesturePrefsObserver::Notify,
                                              base::Unretained(this));
 
   for (size_t i = 0; i < arraysize(kPrefsToObserve); ++i)
     registrar_.Add(kPrefsToObserve[i], callback);
 
   const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
   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);
-
 #if defined(USE_ASH)
   for (size_t i = 0; i < arraysize(kImmersiveModePrefs); ++i)
     registrar_.Add(kImmersiveModePrefs[i], callback);
 #endif  // USE_ASH
   Update();
 }
 
 GesturePrefsObserver::~GesturePrefsObserver() {}
 
 void GesturePrefsObserver::Shutdown() {
@@ skipping 75 matching lines @@
       prefs_->GetDouble(
           prefs::kRailBreakProportion));
   GestureConfiguration::set_rail_start_proportion(
       prefs_->GetDouble(
           prefs::kRailStartProportion));
   GestureConfiguration::set_scroll_prediction_seconds(
       prefs_->GetDouble(prefs::kScrollPredictionSeconds));
   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();
   UpdateImmersiveModePrefs();
 }
 
 void GesturePrefsObserver::UpdateOverscrollPrefs() {
   const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
   for (size_t i = 0; i < overscroll_prefs.size(); ++i) {
     content::SetOverscrollConfig(overscroll_prefs[i].config,
         static_cast<float>(prefs_->GetDouble(overscroll_prefs[i].pref_name)));
   }
@@ skipping 48 matching lines @@
         overscroll_prefs[i].pref_name,
         content::GetOverscrollConfig(overscroll_prefs[i].config),
         user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 }
 
 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::RegisterImmersiveModePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
 #if defined(USE_ASH)
   registry->RegisterIntegerPref(
       prefs::kImmersiveModeRevealDelayMs,
       ImmersiveFullscreenConfiguration::immersive_mode_reveal_delay_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
@@ skipping 156 matching lines @@
   // Use same gesture preferences on incognito windows.
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const {
   // Some tests replace the PrefService of the TestingProfile after the
   // GesturePrefsObserver has been created, which makes Shutdown()
   // remove the registrar from a non-existent PrefService.
   return true;
 }