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

Side by Side Diff: net/proxy/dhcp_proxy_script_fetcher_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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" 5 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
6 6
7 #include "net/base/net_errors.h" 7 #include "net/base/net_errors.h"
8 #include "net/proxy/dhcp_proxy_script_fetcher.h" 8 #include "net/proxy/dhcp_proxy_script_fetcher.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include "net/proxy/dhcp_proxy_script_fetcher_win.h" 11 #include "net/proxy/dhcp_proxy_script_fetcher_win.h"
12 #endif 12 #endif
13 13
14 namespace net { 14 namespace net {
15 15
16 DhcpProxyScriptFetcherFactory::DhcpProxyScriptFetcherFactory() 16 DhcpProxyScriptFetcherFactory::DhcpProxyScriptFetcherFactory()
17 : feature_enabled_(false) { 17 : feature_enabled_(false) {
18 // TODO(joi): Change this default, and the comment on |set_enabled()|, 18 set_enabled(true);
19 // when the time is right.
20 set_enabled(false);
21 } 19 }
22 20
23 DhcpProxyScriptFetcher* DhcpProxyScriptFetcherFactory::Create( 21 DhcpProxyScriptFetcher* DhcpProxyScriptFetcherFactory::Create(
24 URLRequestContext* context) { 22 URLRequestContext* context) {
25 if (!feature_enabled_) { 23 if (!feature_enabled_) {
26 return new DoNothingDhcpProxyScriptFetcher(); 24 return new DoNothingDhcpProxyScriptFetcher();
27 } else { 25 } else {
28 DCHECK(IsSupported()); 26 DCHECK(IsSupported());
29 DhcpProxyScriptFetcher* ret = NULL; 27 DhcpProxyScriptFetcher* ret = NULL;
30 #if defined(OS_WIN) 28 #if defined(OS_WIN)
(...skipping 17 matching lines...) Expand all
48 // static 46 // static
49 bool DhcpProxyScriptFetcherFactory::IsSupported() { 47 bool DhcpProxyScriptFetcherFactory::IsSupported() {
50 #if defined(OS_WIN) 48 #if defined(OS_WIN)
51 return true; 49 return true;
52 #else 50 #else
53 return false; 51 return false;
54 #endif 52 #endif
55 } 53 }
56 54
57 } // namespace net 55 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_factory.h ('k') | net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698