chrome/browser/net/proxy_service_factory.cc - Issue 7167016: Revert 87047 - Revert 86422 - Make DHCP WPAD on by default.

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/net/proxy_service_factory.cc

Issue 7167016: Revert 87047 - Revert 86422 - Make DHCP WPAD on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: merge Created 9 years, 6 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/net/proxy_service_factory.cc

diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc

index cf9792317a8d1e34cd7bea8309171f9702204f8b..898596ebca0e8b36ab9b5af088434b4fbcc0f46b 100644

--- a/chrome/browser/net/proxy_service_factory.cc

+++ b/chrome/browser/net/proxy_service_factory.cc

@@ -86,8 +86,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(

net::ProxyService* proxy_service;

if (use_v8) {

net::DhcpProxyScriptFetcherFactory dhcp_factory;

- if (command_line.HasSwitch(switches::kEnableDhcpWpad)) {

- dhcp_factory.set_enabled(true);

+ if (command_line.HasSwitch(switches::kDisableDhcpWpad)) {

+ dhcp_factory.set_enabled(false);

}

proxy_service = net::ProxyService::CreateUsingV8ProxyResolver(

« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »