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

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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/content_settings/cookie_settings.cc
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
index e34a56e9a1922a7fb0e6c7dd18394459eef7740c..e0b1ff67d1cec902d14fe21b3c2fc8b114ce48f6 100644
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -130,7 +130,7 @@ bool CookieSettings::IsCookieSessionOnly(const GURL& origin) const {
void CookieSettings::GetCookieSettings(
ContentSettingsForOneType* settings) const {
return host_content_settings_map_->GetSettingsForOneType(
- CONTENT_SETTINGS_TYPE_COOKIES, "", settings);
+ CONTENT_SETTINGS_TYPE_COOKIES, std::string(), settings);
}
void CookieSettings::SetDefaultCookieSetting(ContentSetting setting) {
@@ -147,17 +147,21 @@ void CookieSettings::SetCookieSetting(
if (setting == CONTENT_SETTING_SESSION_ONLY) {
DCHECK(secondary_pattern == ContentSettingsPattern::Wildcard());
}
- host_content_settings_map_->SetContentSetting(
- primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_COOKIES, "",
- setting);
+ host_content_settings_map_->SetContentSetting(primary_pattern,
+ secondary_pattern,
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ setting);
}
void CookieSettings::ResetCookieSetting(
const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern) {
- host_content_settings_map_->SetContentSetting(
- primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_COOKIES, "",
- CONTENT_SETTING_DEFAULT);
+ host_content_settings_map_->SetContentSetting(primary_pattern,
+ secondary_pattern,
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ CONTENT_SETTING_DEFAULT);
}
void CookieSettings::ShutdownOnUIThread() {
@@ -176,9 +180,12 @@ ContentSetting CookieSettings::GetCookieSetting(
// First get any host-specific settings.
content_settings::SettingInfo info;
- scoped_ptr<base::Value> value(
- host_content_settings_map_->GetWebsiteSetting(
- url, first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, "", &info));
+ scoped_ptr<base::Value> value(host_content_settings_map_->GetWebsiteSetting(
+ url,
+ first_party_url,
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ &info));
if (source)
*source = info.source;

Powered by Google App Engine
This is Rietveld 408576698