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

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

Issue 2715403005: MD Settings Fix associated-control for bluetooth, people, device subpage (Closed)
Patch Set: Make quick ulock subpages no-search 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/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/neon-animation/neon-ani matable.html"> 5 <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/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="device_page_browser_proxy.html"> 7 <link rel="import" href="device_page_browser_proxy.html">
8 <link rel="import" href="display.html"> 8 <link rel="import" href="display.html">
9 <link rel="import" href="keyboard.html"> 9 <link rel="import" href="keyboard.html">
10 <link rel="import" href="pointers.html"> 10 <link rel="import" href="pointers.html">
(...skipping 18 matching lines...) Expand all
29 <button class="subpage-arrow" is="paper-icon-button-light" 29 <button class="subpage-arrow" is="paper-icon-button-light"
30 aria-label$="[[getPointersTitle_(hasMouse_, 30 aria-label$="[[getPointersTitle_(hasMouse_,
31 hasTouchpad_)]]"></button> 31 hasTouchpad_)]]"></button>
32 </div> 32 </div>
33 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 33 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
34 actionable> 34 actionable>
35 <div class="start">$i18n{keyboardTitle}</div> 35 <div class="start">$i18n{keyboardTitle}</div>
36 <button class="subpage-arrow" is="paper-icon-button-light" 36 <button class="subpage-arrow" is="paper-icon-button-light"
37 aria-label="$i18n{keyboardTitle}"></button> 37 aria-label="$i18n{keyboardTitle}"></button>
38 </div> 38 </div>
39 <template is="dom-if" if="[[hasStylus_]]"> 39 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_"
dpapad 2017/03/01 02:08:05 Is this change from dom-if to hidden necessary?
stevenjb 2017/03/01 16:49:57 Actually, no. I thought it was before I thought to
40 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_" 40 actionable hidden$="[[!hasStylus_]]">
41 actionable> 41 <div class="start">$i18n{stylusTitle}</div>
42 <div class="start">$i18n{stylusTitle}</div>
43 <button class="subpage-arrow" is="paper-icon-button-light" 42 <button class="subpage-arrow" is="paper-icon-button-light"
44 aria-label="$i18n{stylusTitle}"></button> 43 aria-label="$i18n{stylusTitle}"></button>
45 </div> 44 </div>
46 </template>
47 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 45 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
48 actionable> 46 actionable>
49 <div class="start">$i18n{displayTitle}</div> 47 <div class="start">$i18n{displayTitle}</div>
50 <button class="subpage-arrow" is="paper-icon-button-light" 48 <button class="subpage-arrow" is="paper-icon-button-light"
51 aria-label="$i18n{displayTitle}"></button> 49 aria-label="$i18n{displayTitle}"></button>
52 </div> 50 </div>
53 <div id="storageRow" class="settings-box" on-tap="onStorageTap_" 51 <div id="storageRow" class="settings-box" on-tap="onStorageTap_"
54 actionable> 52 actionable>
55 <div class="start">$i18n{storageTitle}</div> 53 <div class="start">$i18n{storageTitle}</div>
56 <button class="subpage-arrow" is="paper-icon-button-light" 54 <button class="subpage-arrow" is="paper-icon-button-light"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 </settings-pointers> 92 </settings-pointers>
95 </settings-subpage> 93 </settings-subpage>
96 </template> 94 </template>
97 <template is="dom-if" route-path="/keyboard-overlay"> 95 <template is="dom-if" route-path="/keyboard-overlay">
98 <settings-subpage 96 <settings-subpage
99 associated-control="[[$$('#keyboardRow')]]" 97 associated-control="[[$$('#keyboardRow')]]"
100 page-title="$i18n{keyboardTitle}"> 98 page-title="$i18n{keyboardTitle}">
101 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> 99 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>
102 </settings-subpage> 100 </settings-subpage>
103 </template> 101 </template>
104 <template is="dom-if" route-path="/stylus"> 102 <template is="dom-if" route-path="/stylus" no-search$="[[!hasStylus_]]">
105 <settings-subpage 103 <settings-subpage
106 associated-control="[[$$('#stylusRow')]]" 104 associated-control="[[$$('#stylusRow')]]"
107 page-title="$i18n{stylusTitle}"> 105 page-title="$i18n{stylusTitle}">
108 <settings-stylus prefs="{{prefs}}"></settings-stylus> 106 <settings-stylus prefs="{{prefs}}"></settings-stylus>
109 </settings-subpage> 107 </settings-subpage>
110 </template> 108 </template>
111 <template is="dom-if" route-path="/display"> 109 <template is="dom-if" route-path="/display">
112 <settings-subpage 110 <settings-subpage
113 associated-control="[[$$('#displayRow')]]" 111 associated-control="[[$$('#displayRow')]]"
114 page-title="$i18n{displayTitle}"> 112 page-title="$i18n{displayTitle}">
115 <settings-display></settings-display> 113 <settings-display></settings-display>
116 </settings-subpage> 114 </settings-subpage>
117 </template> 115 </template>
118 <template is="dom-if" route-path="/storage"> 116 <template is="dom-if" route-path="/storage">
119 <settings-subpage 117 <settings-subpage
120 associated-control="[[$$('#storageRow')]]" 118 associated-control="[[$$('#storageRow')]]"
121 page-title="$i18n{storageTitle}"> 119 page-title="$i18n{storageTitle}">
122 <settings-storage></settings-storage> 120 <settings-storage></settings-storage>
123 </settings-subpage> 121 </settings-subpage>
124 </template> 122 </template>
125 </settings-animated-pages> 123 </settings-animated-pages>
126 </template> 124 </template>
127 <script src="device_page.js"></script> 125 <script src="device_page.js"></script>
128 </dom-module> 126 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698