chrome/browser/importer/firefox_proxy_settings.cc - Issue 3146029: Cleanup: rename ProxyRules::socks_proxy --> ProxyRules::fallback_proxy....

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/importer/firefox_proxy_settings.cc

Issue 3146029: Cleanup: rename ProxyRules::socks_proxy --> ProxyRules::fallback_proxy.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync and include a new chromeos file Created 10 years, 4 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/importer/firefox_proxy_settings.cc

===================================================================

--- chrome/browser/importer/firefox_proxy_settings.cc (revision 57274)

+++ chrome/browser/importer/firefox_proxy_settings.cc (working copy)

@@ -147,7 +147,7 @@

net::ProxyServer::Scheme proxy_scheme = V5 == socks_version() ?

net::ProxyServer::SCHEME_SOCKS5 : net::ProxyServer::SCHEME_SOCKS4;

- config->proxy_rules().socks_proxy = net::ProxyServer(

+ config->proxy_rules().fallback_proxy = net::ProxyServer(

proxy_scheme,

net::HostPortPair(socks_host(), socks_port()));

}