| Index: chrome/browser/resources/settings/people_page/lock_screen.html
|
| diff --git a/chrome/browser/resources/settings/people_page/lock_screen.html b/chrome/browser/resources/settings/people_page/lock_screen.html
|
| index a14921babbe099619444a861d6b1a5a0dc85ffbc..e3ab240ae4055fddf6d5ef264ad9d3ee1a00d570 100644
|
| --- a/chrome/browser/resources/settings/people_page/lock_screen.html
|
| +++ b/chrome/browser/resources/settings/people_page/lock_screen.html
|
| @@ -2,6 +2,7 @@
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">
|
| +<link rel="import" href="/people_page/fingerprint_list.html">
|
| <link rel="import" href="/people_page/lock_state_behavior.html">
|
| <link rel="import" href="/people_page/password_prompt_dialog.html">
|
| <link rel="import" href="/people_page/setup_pin_dialog.html">
|
| @@ -40,7 +41,20 @@
|
| </paper-radio-group>
|
| </div>
|
|
|
| - <div class="settings-box single-column">
|
| + <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
|
| + <div class="settings-box single-column">
|
| + <settings-checkbox
|
| + pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
|
| + label="$i18n{lockScreenFingerprintEnable}">
|
| + </settings-checkbox>
|
| + <iron-collapse
|
| + opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
|
| + <settings-fingerprint-list></settings-fingerprint-list>
|
| + </iron-collapse>
|
| + </div>
|
| + </template>
|
| +
|
| + <div class="settings-box single-column screen-lock">
|
| <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
|
| label="$i18n{enableScreenlock}">
|
| </settings-checkbox>
|
|
|