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

Unified Diff: chromeos/network/onc/onc_validator.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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: chromeos/network/onc/onc_validator.cc
diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
index 4e2e732073a7c6ddf72f555467019ed536aed846..4c2067a7bdb2d17914f64b33a808292fdde852f9 100644
--- a/chromeos/network/onc/onc_validator.cc
+++ b/chromeos/network/onc/onc_validator.cc
@@ -325,7 +325,7 @@ std::string JoinStringRange(const std::vector<const char*>& strings,
const std::string& separator) {
std::vector<std::string> string_vector;
std::copy(strings.begin(), strings.end(), std::back_inserter(string_vector));
- return JoinString(string_vector, separator);
+ return base::JoinString(string_vector, separator);
}
} // namespace
@@ -952,7 +952,7 @@ bool Validator::ValidateCertificate(base::DictionaryValue* result) {
}
std::string Validator::MessageHeader() {
- std::string path = path_.empty() ? "toplevel" : JoinString(path_, ".");
+ std::string path = path_.empty() ? "toplevel" : base::JoinString(path_, ".");
std::string message = "At " + path + ": ";
return message;
}
« no previous file with comments | « chromeos/network/network_change_notifier_chromeos.cc ('k') | cloud_print/virtual_driver/win/install/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698