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

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

Issue 2091143002: Add the authenticate screen for the quick unlock settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-keyboard-fixes
Patch Set: Address comments Created 4 years, 6 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 56dda11a553edd831dc59d6842002eacb1d847c4..2dd7b5e06ff73f72d087af811fe5208b8190831f 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -15,9 +15,9 @@
<if expr="chromeos">
<link rel="import" href="/people_page/change_picture.html">
-<link rel="import" href="/people_page/pin_keyboard.html">
<link rel="import" href="/people_page/easy_unlock_browser_proxy.html">
<link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html">
+<link rel="import" href="/people_page/quick_unlock_authenticate.html">
<link rel="import" href="/people_page/users_page.html">
</if>
<if expr="not chromeos">
@@ -156,22 +156,22 @@
</div>
<if expr="chromeos">
- <!-- TODO(jdufault): Confirm if this goes above or below easy unlock
- settings. -->
- <template is="dom-if" if=[[pinUnlockAllowed_]]>
- <div class="settings-box">
- <!-- TODO(jdufault): i18n -->
- <p>Quick Unlock PIN</p>
- <pin-keyboard></pin-keyboard>
- </div>
- </template>
-
<div class="settings-box">
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
label="$i18n{enableScreenlock}">
</settings-checkbox>
</div>
+ <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is
+ disabled. -->
+ <template is="dom-if" if=[[quickUnlockAllowed_]]>
+ <div class="settings-box">
+ <paper-button on-tap="onQuickUnlockTap_" class="primary-button">
+ $i18n{quickUnlockTitle}
+ </paper-button>
+ </div>
+ </template>
+
<template is="dom-if" if="[[easyUnlockAllowed_]]">
<div class="settings-box">
<div class="middle">
@@ -237,6 +237,15 @@
</settings-subpage>
</template>
<if expr="chromeos">
+ <template is="dom-if" name="quick-unlock-authenticate">
+ <settings-subpage page-title="$i18n{quickUnlockTitle}">
+ <settings-quick-unlock-authenticate
+ account-password="{{quickUnlockAccountPassword}}"
+ current-route="{{currentRoute}}"
+ profile-name="[[profileName_]]">
+ </settings-quick-unlock-authenticate>
+ </settings-subpage>
+ </template>
<template is="dom-if" name="users">
<settings-subpage page-title="$i18n{usersPageTitle}">
<settings-users-page prefs="{{prefs}}"></settings-users-page>

Powered by Google App Engine
This is Rietveld 408576698