| 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 // should be used for the system request context and the signin screen | 42 // should be used for the system request context and the signin screen |
| 43 // (ChromeOS only). | 43 // (ChromeOS only). |
| 44 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState( | 44 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState( |
| 45 PrefService* local_state_prefs); | 45 PrefService* local_state_prefs); |
| 46 | 46 |
| 47 // Create a proxy service according to the options on command line. | 47 // Create a proxy service according to the options on command line. |
| 48 static scoped_ptr<net::ProxyService> CreateProxyService( | 48 static scoped_ptr<net::ProxyService> CreateProxyService( |
| 49 net::NetLog* net_log, | 49 net::NetLog* net_log, |
| 50 net::URLRequestContext* context, | 50 net::URLRequestContext* context, |
| 51 net::NetworkDelegate* network_delegate, | 51 net::NetworkDelegate* network_delegate, |
| 52 net::ProxyConfigService* proxy_config_service, | 52 scoped_ptr<net::ProxyConfigService> proxy_config_service, |
| 53 const base::CommandLine& command_line, | 53 const base::CommandLine& command_line, |
| 54 bool quick_check_enabled); | 54 bool quick_check_enabled); |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); | 57 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ | 60 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ |
| OLD | NEW |