summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/proxy_config_service_impl.h
diff options
context:
space:
mode:
authorpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 11:21:18 +0000
committerpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 11:21:18 +0000
commite3b3e4f790dec14739d71fc5fe75b3652153527e (patch)
tree09511b22b22b70170b7b0273df93e0b14fbacbd8 /chrome/browser/chromeos/proxy_config_service_impl.h
parent0ec80e47c37ccb656cca1d9620fda80809f94692 (diff)
downloadchromium_src-e3b3e4f790dec14739d71fc5fe75b3652153527e.zip
chromium_src-e3b3e4f790dec14739d71fc5fe75b3652153527e.tar.gz
chromium_src-e3b3e4f790dec14739d71fc5fe75b3652153527e.tar.bz2
Extending the translation from ONC to Shill.
Added string expansion and UIData creation. BUG=162040,147624 TBR=jochen@chromium.org (for gypi changes) Review URL: https://chromiumcodereview.appspot.com/11664005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.h')
-rw-r--r--chrome/browser/chromeos/proxy_config_service_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index bb95ee2..6f4271c 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -106,7 +106,7 @@ class ProxyConfigServiceImpl
bool SerializeForNetwork(std::string* output);
// Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>"
- static void EncodeAndAppendProxyServer(const std::string& scheme,
+ static void EncodeAndAppendProxyServer(const std::string& url_scheme,
const net::ProxyServer& server,
std::string* spec);