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

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

Issue 2110833003: MD Settings: Add mouse settings, update pointer settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PointersFake
Patch Set: Created 4 years, 5 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/html/i18n_behavior.html">
1 <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/html/web_ui_listener_behavior.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="/controls/settings_dropdown_menu.html"> 6 <link rel="import" href="/controls/settings_dropdown_menu.html">
5 <link rel="import" href="/device_page/device_page_browser_proxy.html"> 7 <link rel="import" href="/device_page/device_page_browser_proxy.html">
6 <link rel="import" href="/device_page/display.html"> 8 <link rel="import" href="/device_page/display.html">
7 <link rel="import" href="/device_page/keyboard.html"> 9 <link rel="import" href="/device_page/keyboard.html">
8 <link rel="import" href="/device_page/touchpad.html"> 10 <link rel="import" href="/device_page/pointers.html">
9 <link rel="import" href="/icons.html"> 11 <link rel="import" href="/icons.html">
10 <link rel="import" href="/prefs/prefs.html"> 12 <link rel="import" href="/prefs/prefs.html">
11 <link rel="import" href="/settings_page/settings_animated_pages.html"> 13 <link rel="import" href="/settings_page/settings_animated_pages.html">
12 <link rel="import" href="/settings_page/settings_subpage.html"> 14 <link rel="import" href="/settings_page/settings_subpage.html">
13 <link rel="import" href="/settings_shared_css.html"> 15 <link rel="import" href="/settings_shared_css.html">
14 16
15 <dom-module id="settings-device-page"> 17 <dom-module id="settings-device-page">
16 <template> 18 <template>
17 <style include="settings-shared"></style> 19 <style include="settings-shared"></style>
18 <settings-animated-pages id="pages" section="device" 20 <settings-animated-pages id="pages" section="device"
19 current-route="{{currentRoute}}"> 21 current-route="{{currentRoute}}">
20 <neon-animatable id="main"> 22 <neon-animatable id="main">
21 <div id="touchpadRow" class="settings-box first" 23 <div id="pointersRow" class="settings-box first"
22 on-tap="onTouchpadTap_" actionable> 24 hidden$="[[!showPointers_(hasMouse_, hasTouchpad_)]]"
23 <!-- TODO(michaelpg): Get a touchpad icon. --> 25 on-tap="onPointersTap_" actionable>
24 <iron-icon icon="settings:brightness-1"></iron-icon> 26 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]">
25 <div class="middle">$i18n{touchpadTitle}</div> 27 </iron-icon>
28 <div class="middle">
29 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
30 </div>
26 </div> 31 </div>
27 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 32 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
28 actionable> 33 actionable>
29 <iron-icon icon="settings:keyboard"></iron-icon> 34 <iron-icon icon="settings:keyboard"></iron-icon>
30 <div class="middle">$i18n{keyboardTitle}</div> 35 <div class="middle">$i18n{keyboardTitle}</div>
31 </div> 36 </div>
32 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 37 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
33 actionable> 38 actionable>
34 <iron-icon icon="settings:desktop-windows"></iron-icon> 39 <iron-icon icon="settings:desktop-windows"></iron-icon>
35 <div class="middle">$i18n{displayTitle}</div> 40 <div class="middle">$i18n{displayTitle}</div>
36 </div> 41 </div>
37 </neon-animatable> 42 </neon-animatable>
38 <template is="dom-if" name="touchpad"> 43 <template is="dom-if" name="pointers">
39 <settings-subpage page-title="$i18n{touchpadTitle}"> 44 <settings-subpage
40 <settings-touchpad prefs="{{prefs}}"></settings-touchpad> 45 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
46 <settings-pointers prefs="{{prefs}}"
47 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
48 </settings-pointers>
41 </settings-subpage> 49 </settings-subpage>
42 </template> 50 </template>
43 <template is="dom-if" name="keyboard"> 51 <template is="dom-if" name="keyboard">
44 <settings-subpage page-title="$i18n{keyboardTitle}"> 52 <settings-subpage page-title="$i18n{keyboardTitle}">
45 <settings-keyboard prefs="{{prefs}}" current-route="{{currentRoute}}"> 53 <settings-keyboard prefs="{{prefs}}" current-route="{{currentRoute}}">
46 </settings-keyboard> 54 </settings-keyboard>
47 </settings-subpage> 55 </settings-subpage>
48 </template> 56 </template>
49 <template is="dom-if" name="display"> 57 <template is="dom-if" name="display">
50 <settings-subpage page-title="$i18n{displayTitle}"> 58 <settings-subpage page-title="$i18n{displayTitle}">
51 <settings-display></settings-display> 59 <settings-display></settings-display>
52 </settings-subpage> 60 </settings-subpage>
53 </template> 61 </template>
54 </settings-animated-pages> 62 </settings-animated-pages>
55 </template> 63 </template>
56 <script src="device_page.js"></script> 64 <script src="device_page.js"></script>
57 </dom-module> 65 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698