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

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.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/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 85249bcebd251f9f4f5adad733d5a64f89f5ec3f..549856b7957aaa15b4732667f7c4559e08931060 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -123,7 +123,7 @@ std::string ContentSettingToString(ContentSetting setting) {
NOTREACHED();
}
- return "";
+ return std::string();
}
ContentSetting ContentSettingFromString(const std::string& name) {
@@ -151,8 +151,9 @@ DictionaryValue* GetExceptionForPage(
DictionaryValue* exception = new DictionaryValue();
exception->SetString(kOrigin, pattern.ToString());
exception->SetString(kEmbeddingOrigin,
- secondary_pattern == ContentSettingsPattern::Wildcard() ? "" :
- secondary_pattern.ToString());
+ secondary_pattern == ContentSettingsPattern::Wildcard()
+ ? std::string()
+ : secondary_pattern.ToString());
exception->SetString(kSetting, ContentSettingToString(setting));
exception->SetString(kSource, provider_name);
return exception;
@@ -604,7 +605,7 @@ void ContentSettingsHandler::UpdateMediaSettingsView() {
media_ui_settings.SetString("askText", "mediaStreamAsk");
media_ui_settings.SetString("blockText", "mediaStreamBlock");
media_ui_settings.SetBoolean("showBubble", false);
- media_ui_settings.SetString("bubbleText", "");
+ media_ui_settings.SetString("bubbleText", std::string());
web_ui()->CallJavascriptFunction("ContentSettings.updateMediaUI",
media_ui_settings);
@@ -1052,18 +1053,16 @@ void ContentSettingsHandler::RemoveMediaException(
mode == "normal" ? GetContentSettingsMap() :
GetOTRContentSettingsMap();
if (settings_map) {
- settings_map->SetWebsiteSetting(
- ContentSettingsPattern::FromString(pattern),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
- "",
- NULL);
- settings_map->SetWebsiteSetting(
- ContentSettingsPattern::FromString(pattern),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
- "",
- NULL);
+ settings_map->SetWebsiteSetting(ContentSettingsPattern::FromString(pattern),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+ std::string(),
+ NULL);
+ settings_map->SetWebsiteSetting(ContentSettingsPattern::FromString(pattern),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+ std::string(),
+ NULL);
}
}
@@ -1088,10 +1087,11 @@ void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(
if (settings_map) {
settings_map->SetWebsiteSetting(
ContentSettingsPattern::FromString(pattern),
- secondary_pattern.empty() ? ContentSettingsPattern::Wildcard() :
- ContentSettingsPattern::FromString(secondary_pattern),
+ secondary_pattern.empty()
+ ? ContentSettingsPattern::Wildcard()
+ : ContentSettingsPattern::FromString(secondary_pattern),
type,
- "",
+ std::string(),
NULL);
}
}
@@ -1259,7 +1259,7 @@ void ContentSettingsHandler::SetException(const ListValue* args) {
settings_map->SetContentSetting(ContentSettingsPattern::FromString(pattern),
ContentSettingsPattern::Wildcard(),
type,
- "",
+ std::string(),
ContentSettingFromString(setting));
}
}

Powered by Google App Engine
This is Rietveld 408576698