chrome/browser/resources/options/content_settings_exceptions_area.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_exceptions_area.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/browser/resources/options/content_settings.js ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | chrome/browser/ui/website_settings/website_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6be328388d11871e1936826d32244480b965814d..6075599a929d93fb6d57628f47845b6785869940 100644

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

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

@@ -43,6 +43,14 @@

</div>

+ <div contentType="keygen">

msramek 2015/11/05 16:22:31 I would recommend putting this towards the bottom

svaldez 2015/11/05 16:35:12 Done.

+ <list mode="normal"></list>

+ <div>

+ <span class="otr-explanation" i18n-content="otrExceptionsExplanation">

+ </span>

+ <list mode="otr"></list>

+ </div>

<div>