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

Unified Diff: chrome/browser/managed_mode/managed_user_service.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/managed_mode/managed_user_service.cc
diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc
index 0cc29f541eb284b359016833f385d2b6c0e0dcca..80b2bc8f8423b08c3f74d37c2f83ac3c5a526734 100644
--- a/chrome/browser/managed_mode/managed_user_service.cc
+++ b/chrome/browser/managed_mode/managed_user_service.cc
@@ -154,10 +154,10 @@ void ManagedUserService::RegisterUserPrefs(PrefRegistrySyncable* registry) {
ManagedModeURLFilter::BLOCK,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref(prefs::kManagedModeLocalPassphrase,
- "",
+ std::string(),
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref(prefs::kManagedModeLocalSalt,
- "",
+ std::string(),
PrefRegistrySyncable::UNSYNCABLE_PREF);
}
@@ -203,7 +203,7 @@ bool ManagedUserService::UserMayLoad(const extensions::Extension* extension,
string16* error) const {
string16 tmp_error;
// |extension| can be NULL in unit tests.
- if (ExtensionManagementPolicyImpl(extension ? extension->id() : "",
+ if (ExtensionManagementPolicyImpl(extension ? extension->id() : std::string(),
&tmp_error))
return true;
@@ -244,7 +244,8 @@ bool ManagedUserService::UserMayModifySettings(
const extensions::Extension* extension,
string16* error) const {
// |extension| can be NULL in unit tests.
- return ExtensionManagementPolicyImpl(extension ? extension->id() : "", error);
+ return ExtensionManagementPolicyImpl(
+ extension ? extension->id() : std::string(), error);
}
void ManagedUserService::Observe(int type,
« no previous file with comments | « chrome/browser/logging_chrome_browsertest.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698