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 d7de5f4cae81fc783c84d699529bbb8b0221a7f8..539be8ca21272b32809d9569d7d1dcf00c47a0c8 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -325,6 +325,7 @@ void ContentSettingsHandler::GetLocalizedValues( |
{"plugins_header", IDS_PLUGIN_HEADER}, |
{"pluginsAllow", IDS_PLUGIN_ALLOW_RADIO}, |
{"pluginsDetect", IDS_PLUGIN_DETECT_RADIO}, |
+ {"pluginsAsk", IDS_PLUGIN_ASK_RADIO}, |
{"pluginsBlock", IDS_PLUGIN_BLOCK_RADIO}, |
{"disableIndividualPlugins", IDS_PLUGIN_SELECTIVE_DISABLE}, |
// Pop-ups filter. |
@@ -594,12 +595,6 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel( |
profile->GetHostContentSettingsMap()->GetDefaultContentSetting( |
type, &provider_id); |
- // For Plugins, display the obsolete ASK setting as BLOCK. |
- if (type == ContentSettingsType::CONTENT_SETTINGS_TYPE_PLUGINS && |
- default_setting == ContentSetting::CONTENT_SETTING_ASK) { |
- default_setting = ContentSetting::CONTENT_SETTING_BLOCK; |
- } |
- |
base::DictionaryValue filter_settings; |
filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value", |
ContentSettingToString(default_setting)); |