OLD | NEW |
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 set_enabled(true); | 18 // TODO(joi): Change this default, and the comment on |set_enabled()|, |
| 19 // when the time is right. |
| 20 set_enabled(false); |
19 } | 21 } |
20 | 22 |
21 DhcpProxyScriptFetcher* DhcpProxyScriptFetcherFactory::Create( | 23 DhcpProxyScriptFetcher* DhcpProxyScriptFetcherFactory::Create( |
22 URLRequestContext* context) { | 24 URLRequestContext* context) { |
23 if (!feature_enabled_) { | 25 if (!feature_enabled_) { |
24 return new DoNothingDhcpProxyScriptFetcher(); | 26 return new DoNothingDhcpProxyScriptFetcher(); |
25 } else { | 27 } else { |
26 DCHECK(IsSupported()); | 28 DCHECK(IsSupported()); |
27 DhcpProxyScriptFetcher* ret = NULL; | 29 DhcpProxyScriptFetcher* ret = NULL; |
28 #if defined(OS_WIN) | 30 #if defined(OS_WIN) |
(...skipping 17 matching lines...) Expand all Loading... |
46 // static | 48 // static |
47 bool DhcpProxyScriptFetcherFactory::IsSupported() { | 49 bool DhcpProxyScriptFetcherFactory::IsSupported() { |
48 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
49 return true; | 51 return true; |
50 #else | 52 #else |
51 return false; | 53 return false; |
52 #endif | 54 #endif |
53 } | 55 } |
54 | 56 |
55 } // namespace net | 57 } // namespace net |
OLD | NEW |