Index: chrome/browser/ui/webui/options/content_settings_handler.cc |
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc |
index 325974c8390f8292bb605b771b07f735438f0eff..03ee0a7e3cc461cb2ff5dc4065afbcaa819f3488 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -161,6 +161,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { |
#if defined(OS_CHROMEOS) |
{CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, |
#endif |
+ {CONTENT_SETTINGS_TYPE_KEYGEN, "keygen"}, |
}; |
ChooserContextBase* GetUsbChooserContext(Profile* profile) { |
@@ -234,6 +235,10 @@ const ExceptionsInfoMap& GetExceptionsInfoMap() { |
UserMetricsAction( |
"Options_DefaultProtectedMediaIdentifierSettingChanged")))); |
#endif |
+ exceptions_info_map.insert(std::make_pair( |
+ CONTENT_SETTINGS_TYPE_KEYGEN, |
+ ContentSettingWithExceptions( |
+ true, UserMetricsAction("Options_DefaultKeygenSettingChanged")))); |
// Without OTR exceptions. |
exceptions_info_map.insert(std::make_pair( |
@@ -625,6 +630,11 @@ void ContentSettingsHandler::GetLocalizedValues( |
{"usbDevicesManage", IDS_USB_DEVICES_MANAGE_BUTTON}, |
{"zoomlevelsHeader", IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL}, |
{"zoomLevelsManage", IDS_ZOOMLEVELS_MANAGE_BUTTON}, |
+ // Keygen filter. |
+ {"keygenTabLabel", IDS_KEYGEN_TAB_LABEL}, |
+ {"keygenHeader", IDS_KEYGEN_HEADER}, |
+ {"keygenAllow", IDS_KEYGEN_ALLOW_RADIO}, |
+ {"keygenBlock", IDS_KEYGEN_DONOTALLOW_RADIO}, |
}; |
RegisterStrings(localized_strings, resources, arraysize(resources)); |
@@ -681,6 +691,7 @@ void ContentSettingsHandler::GetLocalizedValues( |
IDS_USB_DEVICES_HEADER_AND_TAB_LABEL); |
RegisterTitle(localized_strings, "zoomlevels", |
IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL); |
+ RegisterTitle(localized_strings, "keygen", IDS_KEYGEN_TAB_LABEL); |
localized_strings->SetString("exceptionsLearnMoreUrl", |
kExceptionsLearnMoreUrl); |