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

Unified Diff: chrome/browser/resources/settings/device_page/device_page.html

Issue 2210583002: MD Settings: Associate suppages with the controls that trigger them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve conflicts with ToT Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/device_page/device_page.html
diff --git a/chrome/browser/resources/settings/device_page/device_page.html b/chrome/browser/resources/settings/device_page/device_page.html
index 90caa86599af381ca96f4b8a38da5db304301e36..971567fe99131fccc49742dc3026daad130e321e 100644
--- a/chrome/browser/resources/settings/device_page/device_page.html
+++ b/chrome/browser/resources/settings/device_page/device_page.html
@@ -36,7 +36,7 @@
<div class="middle">$i18n{keyboardTitle}</div>
</div>
<template is="dom-if" if=[[noteAllowed_]]>
- <div class="settings-box" on-tap="onNoteTap_"
+ <div id="noteRow" class="settings-box" on-tap="onNoteTap_"
actionable>
<iron-icon icon="settings:note"></iron-icon>
<div class="middle">$i18n{noteTitle}</div>
@@ -50,6 +50,7 @@
</neon-animatable>
<template is="dom-if" name="pointers">
<settings-subpage
+ associated-control="[[$$('#pointersRow')]]"
page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
<settings-pointers prefs="{{prefs}}"
has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
@@ -57,20 +58,26 @@
</settings-subpage>
</template>
<template is="dom-if" name="keyboard">
- <settings-subpage page-title="$i18n{keyboardTitle}">
+ <settings-subpage
+ associated-control="[[$$('#keyboardRow')]]"
+ page-title="$i18n{keyboardTitle}">
<settings-keyboard prefs="{{prefs}}"></settings-keyboard>
</settings-subpage>
</template>
<template is="dom-if" if=[[noteAllowed_]]>
<template is="dom-if" name="note">
- <settings-subpage page-title="$i18n{noteTitle}">
+ <settings-subpage
+ associated-control="[[$$('#noteRow')]]"
+ page-title="$i18n{noteTitle}">
<settings-note prefs="{{prefs}}" current-route="{{currentRoute}}">
</settings-note>
</settings-subpage>
</template>
</template>
<template is="dom-if" name="display">
- <settings-subpage page-title="$i18n{displayTitle}">
+ <settings-subpage
+ associated-control="[[$$('#displayRow')]]"
+ page-title="$i18n{displayTitle}">
<settings-display></settings-display>
</settings-subpage>
</template>

Powered by Google App Engine
This is Rietveld 408576698