Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Side by Side Diff: chrome/browser/io_thread.h

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 class HostResolver; 34 class HostResolver;
35 class HttpAuthHandlerFactory; 35 class HttpAuthHandlerFactory;
36 class HttpServerProperties; 36 class HttpServerProperties;
37 class HttpTransactionFactory; 37 class HttpTransactionFactory;
38 class NetworkDelegate; 38 class NetworkDelegate;
39 class OriginBoundCertService; 39 class OriginBoundCertService;
40 class ProxyConfigService; 40 class ProxyConfigService;
41 class ProxyService; 41 class ProxyService;
42 class SdchManager; 42 class SdchManager;
43 class SSLConfigService; 43 class SSLConfigService;
44 class TransportSecurityState;
44 class URLRequestContext; 45 class URLRequestContext;
45 class URLRequestContextGetter; 46 class URLRequestContextGetter;
46 class URLSecurityManager; 47 class URLSecurityManager;
47 } // namespace net 48 } // namespace net
48 49
49 // Contains state associated with, initialized and cleaned up on, and 50 // Contains state associated with, initialized and cleaned up on, and
50 // primarily used on, the IO thread. 51 // primarily used on, the IO thread.
51 class IOThread : public content::BrowserThreadDelegate { 52 class IOThread : public content::BrowserThreadDelegate {
52 public: 53 public:
53 struct Globals { 54 struct Globals {
54 Globals(); 55 Globals();
55 ~Globals(); 56 ~Globals();
56 57
57 struct MediaGlobals { 58 struct MediaGlobals {
58 MediaGlobals(); 59 MediaGlobals();
59 ~MediaGlobals(); 60 ~MediaGlobals();
60 // MediaInternals singleton used to aggregate media information. 61 // MediaInternals singleton used to aggregate media information.
61 scoped_ptr<MediaInternals> media_internals; 62 scoped_ptr<MediaInternals> media_internals;
62 } media; 63 } media;
63 64
64 // The "system" NetworkDelegate, used for Profile-agnostic network events. 65 // The "system" NetworkDelegate, used for Profile-agnostic network events.
65 scoped_ptr<net::NetworkDelegate> system_network_delegate; 66 scoped_ptr<net::NetworkDelegate> system_network_delegate;
66 scoped_ptr<net::HostResolver> host_resolver; 67 scoped_ptr<net::HostResolver> host_resolver;
67 scoped_ptr<net::CertVerifier> cert_verifier; 68 scoped_ptr<net::CertVerifier> cert_verifier;
69 // This TransportSecurityState doesn't load or save any state. It's only
70 // used to enforce pinning for system requests and will only use built-in
71 // pins.
72 scoped_ptr<net::TransportSecurityState> transport_security_state;
68 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; 73 scoped_ptr<net::DnsRRResolver> dnsrr_resolver;
69 scoped_refptr<net::SSLConfigService> ssl_config_service; 74 scoped_refptr<net::SSLConfigService> ssl_config_service;
70 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; 75 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
71 scoped_ptr<net::HttpServerProperties> http_server_properties; 76 scoped_ptr<net::HttpServerProperties> http_server_properties;
72 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; 77 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
73 scoped_ptr<net::HttpTransactionFactory> 78 scoped_ptr<net::HttpTransactionFactory>
74 proxy_script_fetcher_http_transaction_factory; 79 proxy_script_fetcher_http_transaction_factory;
75 scoped_ptr<net::FtpTransactionFactory> 80 scoped_ptr<net::FtpTransactionFactory>
76 proxy_script_fetcher_ftp_transaction_factory; 81 proxy_script_fetcher_ftp_transaction_factory;
77 scoped_ptr<net::URLSecurityManager> url_security_manager; 82 scoped_ptr<net::URLSecurityManager> url_security_manager;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 system_url_request_context_getter_; 194 system_url_request_context_getter_;
190 195
191 net::SdchManager* sdch_manager_; 196 net::SdchManager* sdch_manager_;
192 197
193 base::WeakPtrFactory<IOThread> weak_factory_; 198 base::WeakPtrFactory<IOThread> weak_factory_;
194 199
195 DISALLOW_COPY_AND_ASSIGN(IOThread); 200 DISALLOW_COPY_AND_ASSIGN(IOThread);
196 }; 201 };
197 202
198 #endif // CHROME_BROWSER_IO_THREAD_H_ 203 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698