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

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

Issue 1825173003: [Policy Experimental] Add "recommended" policies for URL exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync. Created 4 years, 9 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
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 3f17e4b2b13b8e8181f4dfd575d70115193049a8..29c7e92b15ec3a73a040915cd22be5e38a529d1a 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -849,16 +849,27 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel(
}
}
+ ContentSetting recommended_default_setting =
+ GetContentSettingsMap()->GetRecommendedDefaultContentSetting(type);
+
base::DictionaryValue filter_settings;
+ std::string group_name = ContentSettingsTypeToGroupName(type);
+
std::string setting_string =
content_settings::ContentSettingToString(default_setting);
DCHECK(!setting_string.empty());
- filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value",
- setting_string);
- filter_settings.SetString(
- ContentSettingsTypeToGroupName(type) + ".managedBy", provider_id);
+ filter_settings.SetString(group_name + ".value", setting_string);
+
+ std::string recommended_setting_string =
+ content_settings::ContentSettingToString(recommended_default_setting);
+ DCHECK(!recommended_setting_string.empty());
+
+ filter_settings.SetString(group_name + ".recommendedValue",
+ recommended_setting_string);
+
+ filter_settings.SetString(group_name + ".managedBy", provider_id);
web_ui()->CallJavascriptFunction(
"ContentSettings.setContentFilterSettingsValue", filter_settings);
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/policy_ui_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698