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

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

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Fix test Created 3 years, 10 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/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="device_page_browser_proxy.html"> 8 <link rel="import" href="device_page_browser_proxy.html">
9 <link rel="import" href="display.html"> 9 <link rel="import" href="display.html">
10 <link rel="import" href="keyboard.html"> 10 <link rel="import" href="keyboard.html">
(...skipping 20 matching lines...) Expand all
31 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] 31 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
32 </div> 32 </div>
33 <button class="subpage-arrow" is="paper-icon-button-light"></button> 33 <button class="subpage-arrow" is="paper-icon-button-light"></button>
34 </div> 34 </div>
35 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 35 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
36 actionable> 36 actionable>
37 <iron-icon icon="settings:keyboard"></iron-icon> 37 <iron-icon icon="settings:keyboard"></iron-icon>
38 <div class="middle">$i18n{keyboardTitle}</div> 38 <div class="middle">$i18n{keyboardTitle}</div>
39 <button class="subpage-arrow" is="paper-icon-button-light"></button> 39 <button class="subpage-arrow" is="paper-icon-button-light"></button>
40 </div> 40 </div>
41 <template is="dom-if" if="[[stylusAllowed_]]"> 41 <template is="dom-if" if="[[hasStylus_]]">
42 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_" 42 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_"
43 actionable> 43 actionable>
44 <iron-icon icon="settings:note"></iron-icon> 44 <iron-icon icon="settings:note"></iron-icon>
45 <div class="middle">$i18n{stylusTitle}</div> 45 <div class="middle">$i18n{stylusTitle}</div>
46 <button class="subpage-arrow" is="paper-icon-button-light"></button> 46 <button class="subpage-arrow" is="paper-icon-button-light"></button>
47 </div> 47 </div>
48 </template> 48 </template>
49 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 49 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
50 actionable> 50 actionable>
51 <iron-icon icon="settings:desktop-windows"></iron-icon> 51 <iron-icon icon="settings:desktop-windows"></iron-icon>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 </settings-pointers> 97 </settings-pointers>
98 </settings-subpage> 98 </settings-subpage>
99 </template> 99 </template>
100 <template is="dom-if" route-path="/keyboard-overlay"> 100 <template is="dom-if" route-path="/keyboard-overlay">
101 <settings-subpage 101 <settings-subpage
102 associated-control="[[$$('#keyboardRow')]]" 102 associated-control="[[$$('#keyboardRow')]]"
103 page-title="$i18n{keyboardTitle}"> 103 page-title="$i18n{keyboardTitle}">
104 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> 104 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>
105 </settings-subpage> 105 </settings-subpage>
106 </template> 106 </template>
107 <template is="dom-if" if="[[stylusAllowed_]]"> 107 <template is="dom-if" route-path="/stylus">
108 <template is="dom-if" route-path="/stylus"> 108 <settings-subpage
109 <settings-subpage 109 associated-control="[[$$('#stylusRow')]]"
110 associated-control="[[$$('#stylusRow')]]" 110 page-title="$i18n{stylusTitle}">
111 page-title="$i18n{stylusTitle}"> 111 <settings-stylus prefs="{{prefs}}"></settings-stylus>
112 <settings-stylus prefs="{{prefs}}"></settings-stylus> 112 </settings-subpage>
113 </settings-subpage>
114 </template>
115 </template> 113 </template>
116 <template is="dom-if" route-path="/display"> 114 <template is="dom-if" route-path="/display">
117 <settings-subpage 115 <settings-subpage
118 associated-control="[[$$('#displayRow')]]" 116 associated-control="[[$$('#displayRow')]]"
119 page-title="$i18n{displayTitle}"> 117 page-title="$i18n{displayTitle}">
120 <settings-display></settings-display> 118 <settings-display></settings-display>
121 </settings-subpage> 119 </settings-subpage>
122 </template> 120 </template>
123 <template is="dom-if" route-path="/storage"> 121 <template is="dom-if" route-path="/storage">
124 <settings-subpage 122 <settings-subpage
125 associated-control="[[$$('#storageRow')]]" 123 associated-control="[[$$('#storageRow')]]"
126 page-title="$i18n{storageTitle}"> 124 page-title="$i18n{storageTitle}">
127 <settings-storage></settings-storage> 125 <settings-storage></settings-storage>
128 </settings-subpage> 126 </settings-subpage>
129 </template> 127 </template>
130 </settings-animated-pages> 128 </settings-animated-pages>
131 </template> 129 </template>
132 <script src="device_page.js"></script> 130 <script src="device_page.js"></script>
133 </dom-module> 131 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/settings/device_page/device_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698