Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2196)

Unified Diff: chrome/browser/resources/gesture_config.js

Issue 586933003: fling: Remove a bunch of code for configuring fling curves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/gesture_config.js
diff --git a/chrome/browser/resources/gesture_config.js b/chrome/browser/resources/gesture_config.js
index 2c077e8eb3f235744cee51228100c67f12189fcb..099c2880c56697dc6ad22f7220662a258670d2d6 100644
--- a/chrome/browser/resources/gesture_config.js
+++ b/chrome/browser/resources/gesture_config.js
@@ -179,30 +179,6 @@ function GestureConfig() {
units: 'pixels'
},
{
- key: 'fling_acceleration_curve_coefficient_0',
- label: 'Touchscreen Fling Acceleration',
- units: 'x<sup>3</sup>',
- min: '-1'
- },
- {
- key: 'fling_acceleration_curve_coefficient_1',
- label: '+',
- units: 'x<sup>2</sup>',
- min: '-1'
- },
- {
- key: 'fling_acceleration_curve_coefficient_2',
- label: '+',
- units: 'x<sup>1</sup>',
- min: '-1'
- },
- {
- key: 'fling_acceleration_curve_coefficient_3',
- label: '+',
- units: 'x<sup>0</sup>',
- min: '-1'
- },
- {
key: 'tab_scrub_activation_delay_in_ms',
label: 'Tab scrub auto activation delay, (-1 for never)',
units: 'milliseconds'
@@ -265,57 +241,6 @@ function OverscrollConfig() {
}
/**
- * Returns a GeneralConfig for configuring flingcurve.* preferences.
- * @return {object} A GeneralConfig object.
- */
-function FlingConfig() {
- /** @const */ var FLING_TITLE = 'Fling Configuration';
-
- /** @const */ var FLING_PREFIX = 'flingcurve.';
-
- var FLING_FIELDS = [
- {
- key: 'touchscreen_alpha',
- label: 'Touchscreen fling deacceleration coefficients',
- units: 'alpha',
- min: '-inf'
- },
- {
- key: 'touchscreen_beta',
- label: '',
- units: 'beta',
- min: '-inf'
- },
- {
- key: 'touchscreen_gamma',
- label: '',
- units: 'gamma',
- min: '-inf'
- },
- {
- key: 'touchpad_alpha',
- label: 'Touchpad fling deacceleration coefficients',
- units: 'alpha',
- min: '-inf'
- },
- {
- key: 'touchpad_beta',
- label: '',
- units: 'beta',
- min: '-inf'
- },
- {
- key: 'touchpad_gamma',
- label: '',
- units: 'gamma',
- min: '-inf'
- },
- ];
-
- return new GeneralConfig(FLING_TITLE, FLING_PREFIX, FLING_FIELDS);
-}
-
-/**
* WebUI instance for configuring preference values related to gesture input.
*/
window.gesture_config = {
@@ -329,13 +254,9 @@ window.gesture_config = {
var o = OverscrollConfig();
o.buildAll();
- var f = FlingConfig();
- f.buildAll();
-
$('reset-all-button').onclick = function() {
g.onReset();
o.onReset();
- f.onReset();
};
},
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | chrome/browser/ui/gesture_prefs_observer_factory_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698