chrome/browser/resources/options/options.html - Issue 2236213002: Add quick unlock Settings in options page

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/options/options.html

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 4 years, 4 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:

Index: chrome/browser/resources/options/options.html

diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html

index 350ebccc6a3ce514bd443d0cbad77926c1d6a7f8..07858f48deca4279698645cb9a2ee9f710be538e 100644

--- a/chrome/browser/resources/options/options.html

+++ b/chrome/browser/resources/options/options.html

@@ -3,6 +3,9 @@

<head>

+<if expr="chromeos">

+<link rel="import" href="chrome://settings-frame/options_polymer.html">

+</if>

@@ -62,6 +65,7 @@

+<link rel="stylesheet" href="chromeos/quick_unlock_configure_overlay.css">

@@ -140,6 +144,7 @@

+ <include src="chromeos/quick_unlock_configure_overlay.html">

</if>