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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 11664005: Extending the translation from ONC to Shill. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Initial patch. Created 8 years 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/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 74617adb14816e04d42ce09b52efbdd1b503feb9..6ffb8f79ea8cefd15377dbda0e128e4bd044c4e8 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -363,7 +363,7 @@ bool ProxyConfigServiceImpl::ProxyConfig::SerializeForNetwork(
// static
void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
- const std::string& scheme,
+ const std::string& url_scheme,
const net::ProxyServer& server,
std::string* spec) {
if (!server.is_valid())
@@ -372,8 +372,8 @@ void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
if (!spec->empty())
*spec += ';';
- if (!scheme.empty()) {
- *spec += scheme;
+ if (!url_scheme.empty()) {
+ *spec += url_scheme;
*spec += "=";
}
*spec += server.ToURI();

Powered by Google App Engine
This is Rietveld 408576698