Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1320)

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 902223002: Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 months 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
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698