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

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebased. Created 9 years, 2 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/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 93eea27834da5ba77565970a962f68085442d607..60538bf00a070f9271a4357b73425942cb9818aa 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -334,7 +334,7 @@ ContentSettings HostContentSettingsMap::GetContentSettings(
void HostContentSettingsMap::GetSettingsForOneType(
ContentSettingsType content_type,
const std::string& resource_identifier,
- SettingsForOneType* settings) const {
+ ContentSettingsForOneType* settings) const {
DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
resource_identifier.empty());
DCHECK(settings);
@@ -576,7 +576,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
ProviderType provider_type,
ContentSettingsType content_type,
const std::string& resource_identifier,
- SettingsForOneType* settings,
+ ContentSettingsForOneType* settings,
bool incognito) const {
scoped_ptr<content_settings::RuleIterator> rule_iterator(
provider->GetRuleIterator(content_type,
@@ -592,7 +592,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
provider_type == DEFAULT_PROVIDER)) {
continue;
}
- settings->push_back(PatternSettingSourceTuple(
+ settings->push_back(ContentSettingPatternSourceTuple(
rule.primary_pattern, rule.secondary_pattern,
content_settings::ValueToContentSetting(rule.value.get()),
kProviderNames[provider_type],

Powered by Google App Engine
This is Rietveld 408576698