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

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

Issue 829113004: Plugin Power Saver: Add back 'Click to play' option as 4th for plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 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));
« 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