| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Redefine '$' here rather than including 'cr.js', since this is | 5 // Redefine '$' here rather than including 'cr.js', since this is |
| 6 // the only function needed. This allows this file to be loaded | 6 // the only function needed. This allows this file to be loaded |
| 7 // in a browser directly for layout and some testing purposes. | 7 // in a browser directly for layout and some testing purposes. |
| 8 var $ = function(id) { return document.getElementById(id); }; | 8 var $ = function(id) { return document.getElementById(id); }; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 }, | 237 }, |
| 238 { | 238 { |
| 239 key: 'fling_acceleration_curve_coefficient_2', | 239 key: 'fling_acceleration_curve_coefficient_2', |
| 240 label: '+', | 240 label: '+', |
| 241 units: 'x<sup>1</sup>' | 241 units: 'x<sup>1</sup>' |
| 242 }, | 242 }, |
| 243 { | 243 { |
| 244 key: 'fling_acceleration_curve_coefficient_3', | 244 key: 'fling_acceleration_curve_coefficient_3', |
| 245 label: '+', | 245 label: '+', |
| 246 units: 'x<sup>0</sup>' | 246 units: 'x<sup>0</sup>' |
| 247 }, |
| 248 { |
| 249 key: 'fling_velocity_cap', |
| 250 label: 'Touchscreen Fling Velocity Cap', |
| 251 units: 'pixels / second' |
| 247 } | 252 } |
| 248 ]; | 253 ]; |
| 249 | 254 |
| 250 return new GeneralConfig(GESTURE_PREFIX, GESTURE_FIELDS); | 255 return new GeneralConfig(GESTURE_PREFIX, GESTURE_FIELDS); |
| 251 } | 256 } |
| 252 | 257 |
| 253 /** | 258 /** |
| 254 * Returns a GeneralConfig for configuring overscroll.* preferences. | 259 * Returns a GeneralConfig for configuring overscroll.* preferences. |
| 255 * @return {object} A GeneralConfig object. | 260 * @return {object} A GeneralConfig object. |
| 256 */ | 261 */ |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 $(prefName).value = value; | 325 $(prefName).value = value; |
| 321 } | 326 } |
| 322 | 327 |
| 323 return { | 328 return { |
| 324 initialize: initialize, | 329 initialize: initialize, |
| 325 getPreferenceValueResult: getPreferenceValueResult | 330 getPreferenceValueResult: getPreferenceValueResult |
| 326 }; | 331 }; |
| 327 })(); | 332 })(); |
| 328 | 333 |
| 329 document.addEventListener('DOMContentLoaded', gesture_config.initialize); | 334 document.addEventListener('DOMContentLoaded', gesture_config.initialize); |
| OLD | NEW |