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 c7d6df4234363cc82e3dcb1f51e2a46c4de3d7b8..037526b8325d0befa0edb549ee9bda9244dae475 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -320,7 +320,6 @@ 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}, |
{"manageIndividualPlugins", IDS_PLUGIN_MANAGE_INDIVIDUAL}, |
// Pop-ups filter. |
@@ -605,6 +604,12 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel( |
profile->GetHostContentSettingsMap()->GetDefaultContentSetting( |
type, &provider_id); |
+ // For Plugins, display the obsolete ASK setting as DETECT. |
+ if (type == ContentSettingsType::CONTENT_SETTINGS_TYPE_PLUGINS && |
+ default_setting == ContentSetting::CONTENT_SETTING_ASK) { |
+ default_setting = ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT; |
+ } |
+ |
base::DictionaryValue filter_settings; |
filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value", |
ContentSettingToString(default_setting)); |