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

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

Issue 2509163004: [MD settings] content category policy (Closed)
Patch Set: main toggle and sub-setting toogle show controlled by icon; review changes Created 4 years, 1 month 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 71d5f144c607e1f73669a0ca3df838326d92b6ae..98b4c8eb1a480fc51886eea107fe1147f198e6aa 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -397,9 +397,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