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

Unified Diff: chrome/browser/ui/webui/settings/site_settings_handler.cc

Issue 2552883009: [MD settings] include source of policy for content settings (Closed)
Patch Set: account for unset source Created 4 years 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/settings/site_settings_handler.cc
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
index efbd7880d931776f34715946a565ab1b6f3e7b48..9e476111dbc1e21d2a8b3b974dbab4e25743e927 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -398,9 +398,9 @@ void SiteSettingsHandler::HandleGetDefaultValueForContentType(
HostContentSettingsMap* map =
HostContentSettingsMapFactory::GetForProfile(profile_);
- std::string setting = content_settings::ContentSettingToString(
- map->GetDefaultContentSetting(content_type, nullptr));
- ResolveJavascriptCallback(*callback_id, base::StringValue(setting));
+ base::DictionaryValue category;
+ site_settings::GetContentCategorySetting(map, content_type, &category);
+ ResolveJavascriptCallback(*callback_id, category);
}
void SiteSettingsHandler::HandleGetExceptionList(const base::ListValue* args) {

Powered by Google App Engine
This is Rietveld 408576698