| 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 #ifndef CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 5 #ifndef CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
| 6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState( | 45 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState( |
| 46 PrefService* local_state_prefs); | 46 PrefService* local_state_prefs); |
| 47 | 47 |
| 48 // Create a proxy service according to the options on command line. | 48 // Create a proxy service according to the options on command line. |
| 49 static std::unique_ptr<net::ProxyService> CreateProxyService( | 49 static std::unique_ptr<net::ProxyService> CreateProxyService( |
| 50 net::NetLog* net_log, | 50 net::NetLog* net_log, |
| 51 net::URLRequestContext* context, | 51 net::URLRequestContext* context, |
| 52 net::NetworkDelegate* network_delegate, | 52 net::NetworkDelegate* network_delegate, |
| 53 std::unique_ptr<net::ProxyConfigService> proxy_config_service, | 53 std::unique_ptr<net::ProxyConfigService> proxy_config_service, |
| 54 const base::CommandLine& command_line, | 54 const base::CommandLine& command_line, |
| 55 bool quick_check_enabled); | 55 bool quick_check_enabled, |
| 56 bool pac_https_url_stripping_enabled); |
| 56 | 57 |
| 57 private: | 58 private: |
| 58 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); | 59 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 62 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
| OLD | NEW |