chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 1412523003: Adding <keygen> Content Setting (UI)

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/options/content_settings_exceptions_area.html ('K') | « chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm ('k') | chrome/browser/ui/content_settings/content_setting_image_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/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 76351bd18260d8b26f21e23fefa360ad9285ec6b..4c2145029e849b2d557fb79c0928722c1f8af0a3 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -62,6 +62,7 @@ const ContentSettingsType kSupportedBubbleTypes[] = {

CONTENT_SETTINGS_TYPE_COOKIES,

CONTENT_SETTINGS_TYPE_IMAGES,

CONTENT_SETTINGS_TYPE_JAVASCRIPT,

+ CONTENT_SETTINGS_TYPE_KEYGEN,

CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

CONTENT_SETTINGS_TYPE_PLUGINS,

CONTENT_SETTINGS_TYPE_POPUPS,

@@ -138,12 +139,12 @@ void ContentSettingTitleAndLinkModel::SetTitle() {

{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},

{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_BLOCKED_KEYGEN_TITLE},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_TITLE},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TITLE},

{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,

- IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT},

- {CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

- IDS_BLOCKED_PPAPI_BROKER_TITLE},

+ IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT},

+ {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_TITLE},

{CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE},

};

// Fields as for kBlockedTitleIDs, above.

@@ -170,6 +171,7 @@ void ContentSettingTitleAndLinkModel::SetManageLink() {

{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_LINK},

{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_LINK},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_LINK},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_BLOCKED_KEYGEN_LINK},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_LINK},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_LINK},

{CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_GEOLOCATION_BUBBLE_MANAGE_LINK},

@@ -312,6 +314,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {

{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK},

{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_UNBLOCK},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_UNBLOCK},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_BLOCKED_KEYGEN_UNBLOCK},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK_ALL},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_UNBLOCK},

{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_UNBLOCK},

@@ -341,6 +344,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {

{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION},

{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_NO_ACTION},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_NO_ACTION},

+ {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_BLOCKED_KEYGEN_NO_ACTION},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_NO_ACTION},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_NO_ACTION},

{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_NO_ACTION},