chrome/browser/resources/options/content_settings.html - Issue 1412523003: Adding <keygen> Content Setting (UI)

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

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase on core CL. Created 5 years, 1 month 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

« chrome/app/generated_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/resources/options/content_settings.js » ('j') | chrome/browser/resources/options/content_settings_exceptions_area.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 803b8c06dc6f1bdd032ef5e6667a08a9778d48e7..e3846b79e9b8a957ad7dd4178a5e815119488b28 100644

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

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

@@ -113,6 +113,36 @@

</div>

</section>

+

+ <section>

+ <h3 i18n-content="keygenTabLabel"></h3>

+ <div>

+ <div class="radio controlled-setting-with-label">

+ <label>

+ <input type="radio" name="keygen" value="allow">

+ <span>

+ <span i18n-content="keygenAllow"></span>

+ <span class="controlled-setting-indicator"

+ content-setting="keygen" value="allow"></span>

+ </span>

+ </label>

+ </div>

+ <div class="radio controlled-setting-with-label">

+ <label>

+ <input type="radio" name="keygen" value="block">

+ <span>

+ <span i18n-content="keygenBlock"></span>

+ <span class="controlled-setting-indicator"

+ content-setting="keygen" value="block"></span>

+ </span>

+ </label>

+ </div>

+ <div class="settings-row">

+ <button class="exceptions-list-button" contentType="keygen"

+ i18n-content="manageExceptions"></button>

+ </div>

+ </section>