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

Unified Diff: chrome/browser/ssl/ssl_blocking_page.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
« no previous file with comments | « chrome/browser/ssl/certificate_error_report.cc ('k') | chrome/browser/sxs_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_blocking_page.cc
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index b47aa2e0d7f9dcef3c79059196251988a2ab61a0..327fbadd3a328458d2706f79f2a09860d2867509 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -455,7 +455,7 @@ void SSLBlockingPage::PopulateInterstitialStrings(
ssl_info_.cert->GetPEMEncodedChain(
&encoded_chain);
load_time_data->SetString(
- "pem", JoinString(encoded_chain, std::string()));
+ "pem", base::JoinString(encoded_chain, base::StringPiece()));
cert_report_helper_->PopulateExtendedReportingOption(load_time_data);
}
« no previous file with comments | « chrome/browser/ssl/certificate_error_report.cc ('k') | chrome/browser/sxs_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698