| Index: chrome/browser/resources/options/chromeos/system_options.html
|
| ===================================================================
|
| --- chrome/browser/resources/options/chromeos/system_options.html (revision 114508)
|
| +++ chrome/browser/resources/options/chromeos/system_options.html (working copy)
|
| @@ -31,31 +31,46 @@
|
| i18n-content="brightnessIncrease"></button>
|
| </div>
|
| </section>
|
| - <section id="touchpad-controls" hidden>
|
| - <h3 i18n-content="touchpad"></h3>
|
| + <section id="input-controls">
|
| + <h3 i18n-content="pointer"></h3>
|
| <div class="option-control-table">
|
| <span class="option-name" i18n-content="sensitivity"></span>
|
| - <div id="touchpad-value">
|
| + <div id="pointer-value">
|
| <div id="slider-control">
|
| <input id="sensitivity-range" type="range" min="1" max="5"
|
| pref="settings.touchpad.sensitivity2" class="touch-slider">
|
| <div>
|
| <span i18n-content="sensitivityLess"></span>
|
| <span i18n-content="sensitivityMore"
|
| - class="touchpad-sensitivity-more"></span>
|
| + class="pointer-sensitivity-more"></span>
|
| </div>
|
| </div>
|
| </div>
|
| - <div id="tap-to-click" class="checkbox">
|
| + </div>
|
| + </section>
|
| + <section id="touchpad-controls" hidden>
|
| + <h3 i18n-content="touchpad"></h3>
|
| + <div class="option-control-table">
|
| + <div class="checkbox">
|
| <label>
|
| - <input id="tap-to-click-check"
|
| - pref="settings.touchpad.enable_tap_to_click"
|
| - type="checkbox">
|
| + <input type="checkbox"
|
| + pref="settings.touchpad.enable_tap_to_click">
|
| <span i18n-content="enableTapToClick"></span>
|
| </label>
|
| </div>
|
| - </div>
|
| + </div>
|
| </section>
|
| + <section id="mouse-controls" hidden>
|
| + <h3 i18n-content="mouse"></h3>
|
| + <div class="option-control-table">
|
| + <div class="checkbox">
|
| + <label>
|
| + <input type="checkbox" pref="settings.mouse.primary_right">
|
| + <span i18n-content="primaryMouseRight"></span>
|
| + </label>
|
| + </div>
|
| + </div>
|
| + </section>
|
| <!-- By default, the bluetooth section is hidden. It is only
|
| visible if the command line flag --enable_bluetooth is set. -->
|
| <section id="bluetooth-devices" hidden>
|
| @@ -65,7 +80,7 @@
|
| <button id="enable-bluetooth" i18n-content="enableBluetooth" hidden>
|
| <button id="disable-bluetooth" i18n-content="disableBluetooth">
|
| </div>
|
| - <div id="no-bluetooth-devices-label"
|
| + <div id="no-bluetooth-devices-label"
|
| i18n-content="noBluetoothDevicesFound">
|
| </div>
|
| <div id="bluetooth-device-list">
|
| @@ -86,9 +101,9 @@
|
| <div class="bluetooth-button-group"></div>
|
| </div>
|
| <div id = "bluetooth-finder-container">
|
| - <button id="bluetooth-find-devices"
|
| + <button id="bluetooth-find-devices"
|
| i18n-content="findBluetoothDevices"></button>
|
| - <div id="bluetooth-scanning-icon"
|
| + <div id="bluetooth-scanning-icon"
|
| class="inline-spinner transparent"></div>
|
| <span id="bluetooth-scanning-label" class="transparent"
|
| i18n-content="bluetoothScanning"></span>
|
| @@ -122,4 +137,4 @@
|
| </div>
|
| </section>
|
| </div>
|
| -</div>
|
| +</div>
|
|
|