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

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

Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor change Created 4 years, 8 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 69c929d2a2a68985dc5cc71af2d83a3792132c5b..3a49edcb6b08614ed12a50ab4ef7d6f49a8738f1 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -1354,7 +1354,7 @@ void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(
mode == "normal" ? GetContentSettingsMap() :
GetOTRContentSettingsMap();
if (settings_map) {
- settings_map->SetContentSetting(
+ settings_map->SetContentSettingCustomScope(
ContentSettingsPattern::FromString(pattern),
secondary_pattern.empty()
? ContentSettingsPattern::Wildcard()
@@ -1526,11 +1526,9 @@ void ContentSettingsHandler::SetException(const base::ListValue* args) {
content_settings::ContentSettingFromString(setting, &setting_type);
DCHECK(result);
- settings_map->SetContentSetting(ContentSettingsPattern::FromString(pattern),
- ContentSettingsPattern::Wildcard(),
- type,
- std::string(),
- setting_type);
+ settings_map->SetContentSettingCustomScope(
+ ContentSettingsPattern::FromString(pattern),
+ ContentSettingsPattern::Wildcard(), type, std::string(), setting_type);
WebSiteSettingsUmaUtil::LogPermissionChange(type, setting_type);
}
}
« no previous file with comments | « chrome/browser/ui/exclusive_access/fullscreen_controller.cc ('k') | chrome/browser/ui/webui/plugins/plugins_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698