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

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

Issue 2097673002: Add a settings screen that lets the user choose how they unlock their device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-authenticate
Patch Set: Adjust for authenticate screen 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 2dd7b5e06ff73f72d087af811fe5208b8190831f..91607b3fc51fad0a569ed9a160f6abf6d4e4b1f7 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -18,6 +18,7 @@
<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/quick_unlock_choose_method.html">
<link rel="import" href="/people_page/users_page.html">
</if>
<if expr="not chromeos">
@@ -240,12 +241,21 @@
<template is="dom-if" name="quick-unlock-authenticate">
<settings-subpage page-title="$i18n{quickUnlockTitle}">
<settings-quick-unlock-authenticate
- account-password="{{quickUnlockAccountPassword}}"
+ set-modes="{{quickUnlockSetModes}}"
current-route="{{currentRoute}}"
profile-name="[[profileName_]]">
</settings-quick-unlock-authenticate>
</settings-subpage>
</template>
+ <template is="dom-if" name="quick-unlock-choose-method">
+ <settings-subpage page-title="$i18n{quickUnlockTitle}">
+ <settings-quick-unlock-choose-method
+ set-modes="[[quickUnlockSetModes]]"
+ current-route="{{currentRoute}}"
+ prefs="{{prefs}}">
+ </settings-quick-unlock-choose-method>
+ </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