Added TapSuppressionController params to gesture configurations

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
@@ skipping 56 matching lines @@
 };
 
 // The list of prefs we want to observe.
 // Note that this collection of settings should correspond to the settings used
 // in ui/base/gestures/gesture_configuration.h
 const char* kPrefsToObserve[] = {
   prefs::kFlingAccelerationCurveCoefficient0,
   prefs::kFlingAccelerationCurveCoefficient1,
   prefs::kFlingAccelerationCurveCoefficient2,
   prefs::kFlingAccelerationCurveCoefficient3,
+  prefs::kFlingMaxCancelToDownTimeInMs,
+  prefs::kFlingMaxTapGapTimeInMs,
   prefs::kFlingVelocityCap,
   prefs::kLongPressTimeInSeconds,
   prefs::kMaxDistanceForTwoFingerTapInPixels,
   prefs::kMaxSecondsBetweenDoubleClick,
   prefs::kMaxSeparationForGestureTouchesInPixels,
   prefs::kMaxSwipeDeviationRatio,
   prefs::kMaxTouchDownDurationInSecondsForClick,
   prefs::kMaxTouchMoveInPixelsForClick,
   prefs::kMinDistanceForPinchScrollInPixels,
   prefs::kMinFlickSpeedSquared,
@@ skipping 36 matching lines @@
 
 void GesturePrefsObserver::Update() {
   GestureConfiguration::set_fling_acceleration_curve_coefficients(0,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient0));
   GestureConfiguration::set_fling_acceleration_curve_coefficients(1,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient1));
   GestureConfiguration::set_fling_acceleration_curve_coefficients(2,
       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(
       prefs_->GetDouble(
           prefs::kLongPressTimeInSeconds));
   GestureConfiguration::set_semi_long_press_time_in_seconds(
       prefs_->GetDouble(
           prefs::kSemiLongPressTimeInSeconds));
   GestureConfiguration::set_max_distance_for_two_finger_tap_in_pixels(
       prefs_->GetDouble(
@@ skipping 102 matching lines @@
       GestureConfiguration::fling_acceleration_curve_coefficients(1),
       PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(
       prefs::kFlingAccelerationCurveCoefficient2,
       GestureConfiguration::fling_acceleration_curve_coefficients(2),
       PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(
       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(),
       PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(
       prefs::kLongPressTimeInSeconds,
       GestureConfiguration::long_press_time_in_seconds(),
       PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(
       prefs::kSemiLongPressTimeInSeconds,
@@ skipping 88 matching lines @@
   // Use same gesture preferences on incognito windows.
   return true;
 }
 
 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;
 }