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

Unified Diff: components/content_settings/core/browser/content_settings_utils.cc

Issue 1076153002: Coverting std::String() to ResourceIdentifier() in content_settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/content_settings_pref_provider.cc ('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/content_settings_utils.cc
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index a67bb7de3ba994faa87c3f823ca87d1ef03c8471..2c774fb420fdfc9140f6453ccae4a16dcb09c197 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -91,7 +91,7 @@ std::string ContentSettingToString(ContentSetting setting) {
NOTREACHED();
}
- return std::string();
+ return ResourceIdentifier();
}
ContentSetting ContentSettingFromString(const std::string& name) {
@@ -229,9 +229,13 @@ base::Value* GetContentSettingValueAndPatterns(
void GetRendererContentSettingRules(const HostContentSettingsMap* map,
RendererContentSettingRules* rules) {
map->GetSettingsForOneType(
- CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
+ CONTENT_SETTINGS_TYPE_IMAGES,
+ ResourceIdentifier(),
+ &(rules->image_rules));
map->GetSettingsForOneType(
- CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
+ CONTENT_SETTINGS_TYPE_JAVASCRIPT,
+ ResourceIdentifier(),
+ &(rules->script_rules));
}
} // namespace content_settings
« no previous file with comments | « components/content_settings/core/browser/content_settings_pref_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698