chrome/browser/net/proxy_service_factory.cc - Issue 6831025: Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol.

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 6831025: Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Responding to review comments. Created 9 years, 8 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:

View side-by-side diff with in-line comments

Download patch

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 ad9afd0762ab1156c2ce03a2f1ac2dcacbb6e630..f55f4cab715fcf523e434a08b5725e065b8668ab 100644

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

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

@@ -12,6 +12,7 @@

#include "chrome/common/chrome_switches.h"

#include "content/browser/browser_thread.h"

#include "net/base/net_log.h"

+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"

#include "net/proxy/proxy_config_service.h"

#include "net/proxy/proxy_script_fetcher_impl.h"

#include "net/proxy/proxy_service.h"

@@ -88,6 +89,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(

proxy_config_service,

num_pac_threads,

new net::ProxyScriptFetcherImpl(context),

+ net::DhcpProxyScriptFetcherFactory::Create(context),

context->host_resolver(),

net_log);

} else {

« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/chrome_dll.gypi » ('j') | net/proxy/dhcp_proxy_script_adapter_fetcher_win.h » ('J')