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

Side by Side Diff: chrome/browser/resources/settings/device_page/pointers.html

Issue 2737083002: [MD settings] show icon when slider controlled by something (Closed)
Patch Set: fix mouse pointer unit test Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">
4 <link rel="import" href="../controls/settings_radio_group.html"> 4 <link rel="import" href="../controls/settings_radio_group.html">
5 <link rel="import" href="../controls/settings_toggle_button.html"> 5 <link rel="import" href="../controls/settings_toggle_button.html">
6 <link rel="import" href="device_page_browser_proxy.html"> 6 <link rel="import" href="device_page_browser_proxy.html">
7 <link rel="import" href="../settings_shared_css.html"> 7 <link rel="import" href="../settings_shared_css.html">
8 8
9 <dom-module id="settings-pointers"> 9 <dom-module id="settings-pointers">
10 <template> 10 <template>
(...skipping 18 matching lines...) Expand all
29 <!-- Subsection title only appears if both mouse and touchpad exist. --> 29 <!-- Subsection title only appears if both mouse and touchpad exist. -->
30 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2> 30 <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2>
31 <div class="settings-box first"> 31 <div class="settings-box first">
32 <settings-toggle-button class="start" 32 <settings-toggle-button class="start"
33 pref="{{prefs.settings.mouse.primary_right}}" 33 pref="{{prefs.settings.mouse.primary_right}}"
34 label="$i18n{mouseSwapButtons}"> 34 label="$i18n{mouseSwapButtons}">
35 </settings-toggle-button> 35 </settings-toggle-button>
36 </div> 36 </div>
37 <div class="settings-box"> 37 <div class="settings-box">
38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> 38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div>
39 <cr-slider value="{{prefs.settings.mouse.sensitivity2.value}}" 39 <cr-slider pref="{{prefs.settings.mouse.sensitivity2}}"
40 tick-values="[[sensitivityValues_]]" 40 tick-values="[[sensitivityValues_]]"
41 aria-labelledby="mouseSpeedLabel" 41 aria-labelledby="mouseSpeedLabel"
42 label-min="$i18n{pointerSlow}" 42 label-min="$i18n{pointerSlow}"
43 label-max="$i18n{pointerFast}"> 43 label-max="$i18n{pointerFast}">
44 </cr-slider> 44 </cr-slider>
45 </div> 45 </div>
46 </div> 46 </div>
47 <div id="touchpad" hidden$="[[!hasTouchpad]]" 47 <div id="touchpad" hidden$="[[!hasTouchpad]]"
48 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> 48 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]">
49 <!-- Subsection title only appears if both mouse and touchpad exist. --> 49 <!-- Subsection title only appears if both mouse and touchpad exist. -->
50 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2> 50 <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2>
51 <div class="settings-box block first"> 51 <div class="settings-box block first">
52 <settings-toggle-button id="enableTapToClick" 52 <settings-toggle-button id="enableTapToClick"
53 pref="{{prefs.settings.touchpad.enable_tap_to_click}}" 53 pref="{{prefs.settings.touchpad.enable_tap_to_click}}"
54 label="$i18n{touchpadTapToClickEnabledLabel}"> 54 label="$i18n{touchpadTapToClickEnabledLabel}">
55 </settings-toggle-button> 55 </settings-toggle-button>
56 <settings-toggle-button id="enableTapDragging" 56 <settings-toggle-button id="enableTapDragging"
57 pref="{{prefs.settings.touchpad.enable_tap_dragging}}" 57 pref="{{prefs.settings.touchpad.enable_tap_dragging}}"
58 label="$i18n{tapDraggingLabel}"> 58 label="$i18n{tapDraggingLabel}">
59 </settings-toggle-button> 59 </settings-toggle-button>
60 </div> 60 </div>
61 <div class="settings-box"> 61 <div class="settings-box">
62 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div> 62 <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div>
63 <cr-slider id="touchpadSensitivity" 63 <cr-slider id="touchpadSensitivity"
64 value="{{prefs.settings.touchpad.sensitivity2.value}}" 64 pref="{{prefs.settings.touchpad.sensitivity2}}"
65 tick-values="[[sensitivityValues_]]" 65 tick-values="[[sensitivityValues_]]"
66 aria-labelledby="touchpadSpeedLabel" 66 aria-labelledby="touchpadSpeedLabel"
67 label-min="$i18n{pointerSlow}" 67 label-min="$i18n{pointerSlow}"
68 label-max="$i18n{pointerFast}"> 68 label-max="$i18n{pointerFast}">
69 </cr-slider> 69 </cr-slider>
70 </div> 70 </div>
71 <div class="settings-box">$i18n{scrollLabel}</div> 71 <div class="settings-box">$i18n{scrollLabel}</div>
72 <div class="list-frame"> 72 <div class="list-frame">
73 <settings-radio-group pref="{{prefs.settings.touchpad.natural_scroll}}"> 73 <settings-radio-group pref="{{prefs.settings.touchpad.natural_scroll}}">
74 <paper-radio-button name="false"> 74 <paper-radio-button name="false">
75 $i18n{traditionalScrollLabel} 75 $i18n{traditionalScrollLabel}
76 </paper-radio-button> 76 </paper-radio-button>
77 <paper-radio-button name="true"> 77 <paper-radio-button name="true">
78 $i18n{naturalScrollLabel} 78 $i18n{naturalScrollLabel}
79 <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank" 79 <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank"
80 on-tap="onLearnMoreLinkActivated_" 80 on-tap="onLearnMoreLinkActivated_"
81 on-keydown="onLearnMoreLinkActivated_"> 81 on-keydown="onLearnMoreLinkActivated_">
82 $i18n{naturalScrollLearnMore} 82 $i18n{naturalScrollLearnMore}
83 </a> 83 </a>
84 </paper-radio-button> 84 </paper-radio-button>
85 </settings-radio-group> 85 </settings-radio-group>
86 </div> 86 </div>
87 </div> 87 </div>
88 </template> 88 </template>
89 <script src="pointers.js"></script> 89 <script src="pointers.js"></script>
90 </dom-module> 90 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698