| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape
r-radio-button.html"> |
| 3 <link rel="import" href="../controls/settings_radio_group.html"> | 3 <link rel="import" href="../controls/settings_radio_group.html"> |
| 4 <link rel="import" href="../controls/settings_slider.html"> | 4 <link rel="import" href="../controls/settings_slider.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 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 .subsection > .list-frame { | 23 .subsection > .list-frame { |
| 24 -webkit-margin-start: var(--settings-indent-width); | 24 -webkit-margin-start: var(--settings-indent-width); |
| 25 } | 25 } |
| 26 </style> | 26 </style> |
| 27 <div id="mouse" hidden$="[[!hasMouse]]" | 27 <div id="mouse" hidden$="[[!hasMouse]]" |
| 28 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> | 28 class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]"> |
| 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 <!-- Do not change the mouse button pref before the mouse is released. |
| 33 See crbug.com/686949 --> |
| 34 <settings-toggle-button id="mouseSwapButton" class="start" |
| 33 pref="{{prefs.settings.mouse.primary_right}}" | 35 pref="{{prefs.settings.mouse.primary_right}}" |
| 34 label="$i18n{mouseSwapButtons}"> | 36 label="$i18n{mouseSwapButtons}" |
| 37 on-settings-boolean-control-change="onMouseSwapButtonsChange_" |
| 38 on-down="onMouseSwapButtonsDown_" on-up="onMouseSwapButtonsUp_" |
| 39 no-set-pref> |
| 35 </settings-toggle-button> | 40 </settings-toggle-button> |
| 36 </div> | 41 </div> |
| 37 <div class="settings-box"> | 42 <div class="settings-box"> |
| 38 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> | 43 <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div> |
| 39 <settings-slider pref="{{prefs.settings.mouse.sensitivity2}}" | 44 <settings-slider pref="{{prefs.settings.mouse.sensitivity2}}" |
| 40 tick-values="[[sensitivityValues_]]" | 45 tick-values="[[sensitivityValues_]]" |
| 41 aria-labelledby="mouseSpeedLabel" | 46 aria-labelledby="mouseSpeedLabel" |
| 42 label-min="$i18n{pointerSlow}" | 47 label-min="$i18n{pointerSlow}" |
| 43 label-max="$i18n{pointerFast}"> | 48 label-max="$i18n{pointerFast}"> |
| 44 </settings-slider> | 49 </settings-slider> |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 on-keydown="onLearnMoreLinkActivated_"> | 86 on-keydown="onLearnMoreLinkActivated_"> |
| 82 $i18n{naturalScrollLearnMore} | 87 $i18n{naturalScrollLearnMore} |
| 83 </a> | 88 </a> |
| 84 </paper-radio-button> | 89 </paper-radio-button> |
| 85 </settings-radio-group> | 90 </settings-radio-group> |
| 86 </div> | 91 </div> |
| 87 </div> | 92 </div> |
| 88 </template> | 93 </template> |
| 89 <script src="pointers.js"></script> | 94 <script src="pointers.js"></script> |
| 90 </dom-module> | 95 </dom-module> |
| OLD | NEW |