Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Unified Diff: chrome/browser/browser_main.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/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 9b580b669f88dc88a67e6fa40c3772d7de48d8be..4108b7d743a836842ea49277a42240d3822bb936 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -103,6 +103,7 @@
#include "net/base/network_change_notifier.h"
#include "net/http/http_network_layer.h"
#include "net/http/http_stream_factory.h"
+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
#include "net/socket/client_socket_pool_base.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/socket/tcp_client_socket.h"
@@ -626,6 +627,9 @@ void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
net::HttpStreamFactory::SetHostMappingRules(
parsed_command_line.GetSwitchValueASCII(switches::kHostRules));
+ if (parsed_command_line.HasSwitch(switches::kEnableDhcpWpad))
+ net::DhcpProxyScriptFetcherFactory::SetEnabled(true);
+
if (parsed_command_line.HasSwitch(switches::kEnableIPPooling))
net::SpdySessionPool::enable_ip_pooling(true);
« no previous file with comments | « no previous file | chrome/browser/net/connection_tester.cc » ('j') | net/proxy/dhcp_proxy_script_adapter_fetcher_win.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698