chrome/browser/ui/website_settings/website_settings_ui.cc - 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/ui/website_settings/website_settings_ui.cc

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:

Index: chrome/browser/ui/website_settings/website_settings_ui.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc

index 8dbe87266cae171bbf8c9c61b734936bb12ec801..64b188564dab320e2b16bd7e4be7dc0e5caf5f9c 100644

--- a/chrome/browser/ui/website_settings/website_settings_ui.cc

+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc

@@ -83,6 +83,8 @@ const PermissionsUIInfo kPermissionsUIInfo[] = {

IDR_BLOCKED_IMAGES, IDR_ALLOWED_IMAGES},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT,

IDR_BLOCKED_JAVASCRIPT, IDR_ALLOWED_JAVASCRIPT},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,

+ IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_WEBSITE_SETTINGS_TYPE_POPUPS,

IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS},

#if defined(ENABLE_PLUGINS)