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

Unified Diff: components/content_settings/core/browser/host_content_settings_map.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
« no previous file with comments | « components/content_settings/core/browser/host_content_settings_map.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/content_settings/core/browser/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 5307adea4accab3db64c9445ad8e715bf5ec0bed..978aff41c2b478be224d5ca13d801825741151ce 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -387,11 +387,11 @@ void HostContentSettingsMap::SetNarrowestContentSetting(
narrow_secondary = info.secondary_pattern;
}
- SetContentSetting(narrow_primary, narrow_secondary, type, std::string(),
- setting);
+ SetContentSettingCustomScope(narrow_primary, narrow_secondary, type,
+ std::string(), setting);
}
-void HostContentSettingsMap::SetContentSetting(
+void HostContentSettingsMap::SetContentSettingCustomScope(
const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
ContentSettingsType content_type,
@@ -437,8 +437,8 @@ void HostContentSettingsMap::SetContentSettingDefaultScope(
if (!primary_pattern.IsValid() || !secondary_pattern.IsValid())
return;
- SetContentSetting(primary_pattern, secondary_pattern, content_type,
- resource_identifier, setting);
+ SetContentSettingCustomScope(primary_pattern, secondary_pattern, content_type,
+ resource_identifier, setting);
}
void HostContentSettingsMap::MigrateOldSettings() {
@@ -476,7 +476,7 @@ void HostContentSettingsMap::MigrateOldSettings() {
content_setting = GetContentSetting(url, url, type, std::string());
}
// Remove the old pattern.
- SetContentSetting(setting_entry.primary_pattern,
+ SetContentSettingCustomScope(setting_entry.primary_pattern,
setting_entry.secondary_pattern, type, std::string(),
CONTENT_SETTING_DEFAULT);
// Set the new pattern.
« no previous file with comments | « components/content_settings/core/browser/host_content_settings_map.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698