chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 11664005: Extending the translation from ONC to Shill.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased. Created 7 years, 11 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:

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 eee5875162e66103420e86b02a89b4626b18d3c3..23e91fe096d751b8b6a4ed8c6939e37f27b3d511 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();