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

Unified Diff: chrome/browser/resources/settings/device_page/keyboard.html

Issue 1967913002: Material WebUI: cr-slider element for intelligent range mapping (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KeyboardFinish
Patch Set: Created 4 years, 7 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/settings/device_page/keyboard.html
diff --git a/chrome/browser/resources/settings/device_page/keyboard.html b/chrome/browser/resources/settings/device_page/keyboard.html
index 7289495dcad6d5d87918d8490bdfbcc0e342e586..a41130817c5ec00054dc11b662588c76cb69b29a 100644
--- a/chrome/browser/resources/settings/device_page/keyboard.html
+++ b/chrome/browser/resources/settings/device_page/keyboard.html
@@ -1,11 +1,12 @@
+<link rel="import" href="chrome://resources/cr_elements/slider/slider_host_behavior.html">
<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html">
<link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
<link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.html">
<link rel="import" href="chrome://md-settings/i18n_setup.html">
-<link rel="import" href="chrome://md-settings/prefs/prefs_behavior.html">
<link rel="import" href="chrome://md-settings/settings_shared_css.html">
<dom-module id="settings-keyboard">
@@ -70,7 +71,12 @@
<div class="layout horizontal center">
<div>$i18n{keyRepeatDelayLong}</div>
<paper-slider id="delaySlider" class="always-on" snaps
- max="[[delayMaxTick_()]]" on-change="onDelaySliderChange_"
+ data-value-path="prefs.settings.language.xkb_auto_repeat_delay_r2.value"
stevenjb 2016/05/11 16:37:40 nit: split line (here and below)?
michaelpg 2016/05/14 04:44:33 meh. sometimes it helps, sometimes it doesn't, and
+ slider-tick-values="[[autoRepeatDelays_]]"
+ value="[[getSliderIndexFromValue(
+ prefs.settings.language.xkb_auto_repeat_delay_r2.value,
+ autoRepeatDelays_)]]"
+ on-change="onSliderChange" on-value-change="onSliderValueChange"
disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
aria-labelledby="repeatDelayLabel">
</paper-slider>
@@ -82,9 +88,13 @@
<div class="layout horizontal center">
<div>$i18n{keyRepeatRateSlow}</div>
<paper-slider id="repeatRateSlider" class="always-on" snaps
- max="[[repeatRateMaxTick_()]]"
- on-change="onRepeatRateSliderChange_"
- disabled="{{!prefs.settings.language.xkb_auto_repeat_enabled_r2.value}}"
+ data-value-path="prefs.settings.language.xkb_auto_repeat_interval_r2.value"
+ slider-tick-values="[[autoRepeatIntervals_]]"
+ value="[[getSliderIndexFromValue(
+ prefs.settings.language.xkb_auto_repeat_interval_r2.value,
+ autoRepeatIntervals_)]]"
+ on-change="onSliderChange" on-value-change="onSliderValueChange"
+ disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
aria-labelledby="repeatRateLabel">
</paper-slider>
<div>$i18n{keyRepeatRateFast}</div>

Powered by Google App Engine
This is Rietveld 408576698