chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - 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/cocoa/content_settings/content_setting_bubble_cocoa.mm

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/browser/resources/options/content_settings_exceptions_area.html ('K') | « chrome/browser/resources/options/content_settings_exceptions_area.html ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/website_settings/website_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

index eeab29d80534f94f15d06323a59720717e3edcb1..aafa639ef7c7d842aa3e2188b3579fdd5b4659ce 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -245,6 +245,7 @@ const ContentTypeToNibPath kNibPaths[] = {

{CONTENT_SETTINGS_TYPE_COOKIES, @"ContentBlockedCookies"},

{CONTENT_SETTINGS_TYPE_IMAGES, @"ContentBlockedSimple"},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, @"ContentBlockedSimple"},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, @"ContentBlockedSimple"},

{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, @"ContentBlockedSimple"},

{CONTENT_SETTINGS_TYPE_PLUGINS, @"ContentBlockedPlugins"},

{CONTENT_SETTINGS_TYPE_POPUPS, @"ContentBlockedPopups"},