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_IO_THREAD_H_ | 5 #ifndef CHROME_BROWSER_IO_THREAD_H_ |
6 #define CHROME_BROWSER_IO_THREAD_H_ | 6 #define CHROME_BROWSER_IO_THREAD_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <list> | 9 #include <list> |
10 #include <string> | 10 #include <string> |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 scoped_ptr<net::CertVerifier> cert_verifier; | 51 scoped_ptr<net::CertVerifier> cert_verifier; |
52 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; | 52 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; |
53 scoped_refptr<net::SSLConfigService> ssl_config_service; | 53 scoped_refptr<net::SSLConfigService> ssl_config_service; |
54 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; | 54 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
55 scoped_refptr<net::ProxyService> proxy_script_fetcher_proxy_service; | 55 scoped_refptr<net::ProxyService> proxy_script_fetcher_proxy_service; |
56 scoped_ptr<net::HttpTransactionFactory> | 56 scoped_ptr<net::HttpTransactionFactory> |
57 proxy_script_fetcher_http_transaction_factory; | 57 proxy_script_fetcher_http_transaction_factory; |
58 scoped_ptr<net::URLSecurityManager> url_security_manager; | 58 scoped_ptr<net::URLSecurityManager> url_security_manager; |
59 ChromeNetworkDelegate network_delegate; | 59 ChromeNetworkDelegate network_delegate; |
60 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context; | 60 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context; |
| 61 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; |
| 62 scoped_refptr<net::ProxyService> system_proxy_service; |
| 63 // NOTE(willchan): This request context is unusable until a system |
| 64 // SSLConfigService and ProxyService are provided that don't rely on |
| 65 // Profiles. Do NOT use this yet. |
| 66 scoped_refptr<net::URLRequestContext> system_request_context; |
61 }; | 67 }; |
62 | 68 |
63 // |net_log| must either outlive the IOThread or be NULL. | 69 // |net_log| must either outlive the IOThread or be NULL. |
64 IOThread(PrefService* local_state, ChromeNetLog* net_log); | 70 IOThread(PrefService* local_state, ChromeNetLog* net_log); |
65 | 71 |
66 virtual ~IOThread(); | 72 virtual ~IOThread(); |
67 | 73 |
68 // Can only be called on the IO thread. | 74 // Can only be called on the IO thread. |
69 Globals* globals(); | 75 Globals* globals(); |
70 | 76 |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 | 165 |
160 // Keeps track of all live ChromeURLRequestContextGetters, so the | 166 // Keeps track of all live ChromeURLRequestContextGetters, so the |
161 // ChromeURLRequestContexts can be released during | 167 // ChromeURLRequestContexts can be released during |
162 // IOThread::CleanUpAfterMessageLoopDestruction(). | 168 // IOThread::CleanUpAfterMessageLoopDestruction(). |
163 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_; | 169 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_; |
164 | 170 |
165 DISALLOW_COPY_AND_ASSIGN(IOThread); | 171 DISALLOW_COPY_AND_ASSIGN(IOThread); |
166 }; | 172 }; |
167 | 173 |
168 #endif // CHROME_BROWSER_IO_THREAD_H_ | 174 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |