chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 1432573002: Adding <keygen> Content Setting (Android 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 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui

Patch Set: Fix rebase across multiple ancestors. Created 5 years 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/android/preferences/website_preference_bridge.cc ('K') | « chrome/browser/ui/android/website_settings_popup_android.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
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 802a42df08405880ea3c20138e892e7172c875f1..b160e8d58fc11e1e321a8a996050c48da52a17f8 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"},

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

{CONTENT_SETTINGS_TYPE_MEDIASTREAM, @"ContentBlockedMedia"},

{CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, @"ContentBlockedDownloads"},

{CONTENT_SETTINGS_TYPE_MIDI_SYSEX, @"ContentBlockedMIDISysEx"},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, @"ContentBlockedSimple"},

};

- (id)initWithModel:(ContentSettingBubbleModel*)contentSettingBubbleModel