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

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: rebase fix 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 391f9797bcdea0ed8860b2ad051703d30b06cf4d..98a510a94c3f610bcb33fad9d49ae393112d89ba 100644
--- a/chrome/browser/resources/settings/device_page/keyboard.html
+++ b/chrome/browser/resources/settings/device_page/keyboard.html
@@ -1,11 +1,11 @@
+<link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html">
+<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/html/polymer.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="/controls/settings_checkbox.html">
<link rel="import" href="/controls/settings_dropdown_menu.html">
<link rel="import" href="/i18n_setup.html">
-<link rel="import" href="/prefs/prefs_behavior.html">
<link rel="import" href="/settings_shared_css.html">
<dom-module id="settings-keyboard">
@@ -69,11 +69,12 @@
<div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div>
<div class="layout horizontal center">
<div>$i18n{keyRepeatDelayLong}</div>
- <paper-slider id="delaySlider" class="always-on" snaps
- max="[[delayMaxTick_()]]" on-change="onDelaySliderChange_"
+ <cr-slider id="delaySlider" class="always-on" snaps
+ value="{{prefs.settings.language.xkb_auto_repeat_delay_r2.value}}"
+ tick-values="[[autoRepeatDelays_]]"
disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
aria-labelledby="repeatDelayLabel">
- </paper-slider>
+ </cr-slider>
<div>$i18n{keyRepeatDelayShort}</div>
</div>
</div>
@@ -81,12 +82,12 @@
<div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div>
<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}}"
+ <cr-slider id="repeatRateSlider" class="always-on" snaps
+ value="{{prefs.settings.language.xkb_auto_repeat_interval_r2.value}}"
+ tick-values="[[autoRepeatIntervals_]]"
+ disabled="[[!prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]"
aria-labelledby="repeatRateLabel">
- </paper-slider>
+ </cr-slider>
<div>$i18n{keyRepeatRateFast}</div>
</div>
</div>

Powered by Google App Engine
This is Rietveld 408576698