MD Settings: cr-slider: Make display consistent and clean up.

chrome/browser/resources/settings/device_page/keyboard.html

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 6b111be75f11b3673725b225b3ab84caaab3401e..629281e13434878b205ce777934a0ca486839045 100644
--- a/chrome/browser/resources/settings/device_page/keyboard.html
+++ b/chrome/browser/resources/settings/device_page/keyboard.html
@@ -2,7 +2,6 @@
 <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="/controls/settings_checkbox.html">
 <link rel="import" href="/controls/settings_dropdown_menu.html">
 <link rel="import" href="/i18n_setup.html">
@@ -82,29 +81,28 @@
         opened="[[prefs.settings.language.xkb_auto_repeat_enabled_r2.value]]">
       <div class="settings-box continuation settings-checkbox-spacer">
         <div class="start" id="repeatDelayLabel">$i18n{keyRepeatDelay}</div>
-        <div class="layout horizontal center">
-          <div>$i18n{keyRepeatDelayLong}</div>
-          <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">
-          </cr-slider>
-          <div>$i18n{keyRepeatDelayShort}</div>
-        </div>
+        <cr-slider id="delaySlider"
+            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"
+            label-min="$i18n{keyRepeatDelayLong}"
+            label-max="$i18n{keyRepeatDelayShort}">
+        </cr-slider>
       </div>
       <div class="settings-box continuation settings-checkbox-spacer">
         <div class="start" id="repeatRateLabel">$i18n{keyRepeatRate}</div>
-        <div class="layout horizontal center">
-          <div>$i18n{keyRepeatRateSlow}</div>
-          <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">
-          </cr-slider>
-          <div>$i18n{keyRepeatRateFast}</div>
-        </div>
+        <cr-slider id="repeatRateSlider"
+            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"
+            label-min="$i18n{keyRepeatRateSlow}"
+            label-max="$i18n{keyRepeatRateFast}">
+        </cr-slider>
       </div>
     </iron-collapse>
     <div id="keyboardOverlay" class="settings-box"