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 f2d4f48c0ab5f68b3b94f453cc8a7c4391202b1c..1e53ae7c06c946ced06497b6d99284d17af3ae1d 100644 |
--- a/chrome/browser/resources/settings/people_page/people_page.html |
+++ b/chrome/browser/resources/settings/people_page/people_page.html |
@@ -187,30 +187,19 @@ |
</template> |
<if expr="chromeos"> |
- <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
- <div class="settings-box"> |
- <settings-toggle-button class="start" |
- pref="{{prefs.settings.enable_screen_lock}}" |
- label="$i18n{enableScreenlock}"> |
- </settings-toggle-button> |
- </div> |
- </template> |
- |
- <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
- <div class="settings-box two-line" actionable |
- on-tap="onConfigureLockTap_"> |
- <div class="start"> |
- $i18n{lockScreenTitle} |
- <div class="secondary" id="lockScreenSecondary"> |
- [[getPasswordState_(hasPin, |
- prefs.settings.enable_screen_lock.value)]] |
- </div> |
+ <div class="settings-box two-line" actionable |
+ on-tap="onConfigureLockTap_"> |
+ <div class="start"> |
+ $i18n{lockScreenTitle} |
+ <div class="secondary" id="lockScreenSecondary"> |
+ [[getPasswordState_(hasPin, |
+ prefs.settings.enable_screen_lock.value)]] |
</div> |
- <button id="lockScreenSubpageTrigger" class="subpage-arrow" |
- is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" |
- aria-describedby="lockScrenSecondary"></button> |
</div> |
- </template> |
+ <button id="lockScreenSubpageTrigger" class="subpage-arrow" |
+ is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}" |
+ aria-describedby="lockScrenSecondary"></button> |
+ </div> |
</if> |
<div id="manage-other-people-subpage-trigger" |
@@ -250,14 +239,14 @@ |
</settings-subpage> |
</template> |
<if expr="chromeos"> |
- <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
- <template is="dom-if" route-path="/lockScreen" no-search> |
- <settings-subpage page-title="$i18n{lockScreenTitle}"> |
- <settings-lock-screen |
- prefs="{{prefs}}"> |
- </settings-lock-screen> |
- </settings-subpage> |
- </template> |
+ <template is="dom-if" route-path="/lockScreen" no-search> |
+ <settings-subpage page-title="$i18n{lockScreenTitle}"> |
+ <settings-lock-screen |
+ prefs="{{prefs}}"> |
+ </settings-lock-screen> |
+ </settings-subpage> |
+ </template> |
+ <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> |
jdufault
2017/05/04 21:03:45
Do we need a dedicated route for setting up finger
sammiequon
2017/05/04 23:32:34
Yeah it's still possible for a user to navigate di
jdufault
2017/05/04 23:39:03
Can we just remove the route entirely? Do we have
|
<template is="dom-if" route-path="/lockScreen/fingerprint" no-search> |
<settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> |
<settings-fingerprint-list></settings-fingerprint-list> |