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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Address comments Created 4 years, 5 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

« no previous file with comments | « chrome/browser/resources/settings/people_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/people_page/quick_unlock_choose_method.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 86050811ae66ec9d701379288ede13f56a3c6413..dae5c76a4dfe4e5050f354ff4a4a14e6f22926a9 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/quick_unlock_choose_method.html">

</if>

@@ -242,12 +243,21 @@

<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>

<settings-subpage page-title="$i18n{usersPageTitle}">

<settings-users-page prefs="{{prefs}}"></settings-users-page>