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

Unified Diff: chrome/browser/net/firefox_proxy_settings.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/extensions/webstore_installer.cc ('k') | chrome/browser/net/predictor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/firefox_proxy_settings.cc
diff --git a/chrome/browser/net/firefox_proxy_settings.cc b/chrome/browser/net/firefox_proxy_settings.cc
index 2b23e01d5ae1fb70156133334cc4b4b62d5e750d..203d9557f6cef98390ece7109b53116113da26eb 100644
--- a/chrome/browser/net/firefox_proxy_settings.cc
+++ b/chrome/browser/net/firefox_proxy_settings.cc
@@ -236,7 +236,7 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) {
}
config->proxy_rules().bypass_rules.ParseFromStringUsingSuffixMatching(
- JoinString(proxy_bypass_list_, ';'));
+ base::JoinString(proxy_bypass_list_, ";"));
return true;
}
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | chrome/browser/net/predictor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698