Chromium Code Reviews| 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 19 matching lines...) Expand all Loading... | |
| 30 class ListValue; | 30 class ListValue; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace chrome_browser_net { | 33 namespace chrome_browser_net { |
| 34 class ConnectInterceptor; | 34 class ConnectInterceptor; |
| 35 class Predictor; | 35 class Predictor; |
| 36 } // namespace chrome_browser_net | 36 } // namespace chrome_browser_net |
| 37 | 37 |
| 38 namespace net { | 38 namespace net { |
| 39 class CertVerifier; | 39 class CertVerifier; |
| 40 class CookieStore; | |
| 40 class DnsRRResolver; | 41 class DnsRRResolver; |
| 41 class FtpTransactionFactory; | 42 class FtpTransactionFactory; |
| 42 class HostResolver; | 43 class HostResolver; |
| 43 class HttpAuthHandlerFactory; | 44 class HttpAuthHandlerFactory; |
| 44 class HttpTransactionFactory; | 45 class HttpTransactionFactory; |
| 45 class NetworkDelegate; | 46 class NetworkDelegate; |
| 47 class OriginBoundCertService; | |
| 46 class ProxyConfigService; | 48 class ProxyConfigService; |
| 47 class ProxyScriptFetcher; | 49 class ProxyScriptFetcher; |
| 48 class ProxyService; | 50 class ProxyService; |
| 49 class SSLConfigService; | 51 class SSLConfigService; |
| 50 class URLRequestContext; | 52 class URLRequestContext; |
| 51 class URLRequestContextGetter; | 53 class URLRequestContextGetter; |
| 52 class URLSecurityManager; | 54 class URLSecurityManager; |
| 53 } // namespace net | 55 } // namespace net |
| 54 | 56 |
| 55 class IOThread : public BrowserProcessSubThread { | 57 class IOThread : public BrowserProcessSubThread { |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 68 // The "system" NetworkDelegate, used for Profile-agnostic network events. | 70 // The "system" NetworkDelegate, used for Profile-agnostic network events. |
| 69 scoped_ptr<net::NetworkDelegate> system_network_delegate; | 71 scoped_ptr<net::NetworkDelegate> system_network_delegate; |
| 70 scoped_ptr<net::HostResolver> host_resolver; | 72 scoped_ptr<net::HostResolver> host_resolver; |
| 71 scoped_ptr<net::CertVerifier> cert_verifier; | 73 scoped_ptr<net::CertVerifier> cert_verifier; |
| 72 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; | 74 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; |
| 73 scoped_refptr<net::SSLConfigService> ssl_config_service; | 75 scoped_refptr<net::SSLConfigService> ssl_config_service; |
| 74 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; | 76 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
| 75 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; | 77 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; |
| 76 scoped_ptr<net::HttpTransactionFactory> | 78 scoped_ptr<net::HttpTransactionFactory> |
| 77 proxy_script_fetcher_http_transaction_factory; | 79 proxy_script_fetcher_http_transaction_factory; |
| 80 // |cookie_store| and |origin_bound_cert_service| are shared between | |
| 81 // |proxy_script_fetcher_context| and |system_request_context|. | |
| 82 scoped_refptr<net::CookieStore> cookie_store; | |
| 83 scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service; | |
|
wtc
2011/08/09 17:43:45
These two members should be given a system_ prefix
| |
| 78 scoped_ptr<net::FtpTransactionFactory> | 84 scoped_ptr<net::FtpTransactionFactory> |
| 79 proxy_script_fetcher_ftp_transaction_factory; | 85 proxy_script_fetcher_ftp_transaction_factory; |
| 80 scoped_ptr<net::URLSecurityManager> url_security_manager; | 86 scoped_ptr<net::URLSecurityManager> url_security_manager; |
| 81 // We use a separate URLRequestContext for PAC fetches, in order to break | 87 // We use a separate URLRequestContext for PAC fetches, in order to break |
| 82 // the reference cycle: | 88 // the reference cycle: |
| 83 // URLRequestContext=>PAC fetch=>URLRequest=>URLRequestContext. | 89 // URLRequestContext=>PAC fetch=>URLRequest=>URLRequestContext. |
| 84 // The first URLRequestContext is |system_url_request_context|. We introduce | 90 // The first URLRequestContext is |system_url_request_context|. We introduce |
| 85 // |proxy_script_fetcher_context| for the second context. It has a direct | 91 // |proxy_script_fetcher_context| for the second context. It has a direct |
| 86 // ProxyService, since we always directly connect to fetch the PAC script. | 92 // ProxyService, since we always directly connect to fetch the PAC script. |
| 87 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context; | 93 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context; |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 238 // ChromeURLRequestContexts can be released during | 244 // ChromeURLRequestContexts can be released during |
| 239 // IOThread::CleanUp(). | 245 // IOThread::CleanUp(). |
| 240 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_; | 246 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_; |
| 241 | 247 |
| 242 ScopedRunnableMethodFactory<IOThread> method_factory_; | 248 ScopedRunnableMethodFactory<IOThread> method_factory_; |
| 243 | 249 |
| 244 DISALLOW_COPY_AND_ASSIGN(IOThread); | 250 DISALLOW_COPY_AND_ASSIGN(IOThread); |
| 245 }; | 251 }; |
| 246 | 252 |
| 247 #endif // CHROME_BROWSER_IO_THREAD_H_ | 253 #endif // CHROME_BROWSER_IO_THREAD_H_ |
| OLD | NEW |