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

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

Issue 2715403005: MD Settings Fix associated-control for bluetooth, people, device subpage (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/people_page/people_page.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index 742e7ec4a1ae902c5ade9f76e5c20300b2f03215..f41483e3517d03fab09ffefefb7435341c185f0f 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -226,7 +226,7 @@
</template>
<template is="dom-if" if="[[quickUnlockEnabled_]]">
- <div class="settings-box two-line" actionable
+ <div id="quick-unlock" class="settings-box two-line" actionable
on-tap="onConfigureLockTap_">
<div class="start">
$i18n{lockScreenTitle}
@@ -328,17 +328,19 @@
<if expr="chromeos">
<template is="dom-if" if="[[quickUnlockEnabled_]]">
<template is="dom-if" route-path="/lockScreen" no-search>
dpapad 2017/02/28 23:56:12 Unless you remove no-search here, the associated-c
stevenjb 2017/03/01 00:20:31 Ah, I didn't see that. No reason I can think of fo
- <settings-subpage page-title="$i18n{lockScreenTitle}">
+ <settings-subpage associated-control="[[$$('#quick-unlock')]]"
+ page-title="$i18n{lockScreenTitle}">
<settings-lock-screen
prefs="{{prefs}}">
</settings-lock-screen>
</settings-subpage>
</template>
- </template>
- <template is="dom-if" route-path="/lockScreen/fingerprint">
- <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}">
- <settings-fingerprint-list></settings-fingerprint-list>
- </settings-subpage>
+ <template is="dom-if" route-path="/lockScreen/fingerprint">
+ <settings-subpage associated-control="[[$$('#quick-unlock')]]"
+ page-title="$i18n{lockScreenFingerprintTitle}">
+ <settings-fingerprint-list></settings-fingerprint-list>
+ </settings-subpage>
+ </template>
</template>
<template is="dom-if" route-path="/accounts">
<settings-subpage

Powered by Google App Engine
This is Rietveld 408576698