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

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

Issue 7493025: Instantiate OriginBoundCertService in relevant places and do plumbing to pass it down to HttpNetw... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months 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') | chrome/browser/io_thread.cc » ('J')
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 <list> 9 #include <list>
10 #include <string> 10 #include <string>
(...skipping 25 matching lines...) Expand all
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 DnsRRResolver; 40 class DnsRRResolver;
41 class FtpTransactionFactory; 41 class FtpTransactionFactory;
42 class HostResolver; 42 class HostResolver;
43 class HttpAuthHandlerFactory; 43 class HttpAuthHandlerFactory;
44 class HttpTransactionFactory; 44 class HttpTransactionFactory;
45 class NetworkDelegate; 45 class NetworkDelegate;
46 class OriginBoundCertService;
46 class ProxyConfigService; 47 class ProxyConfigService;
47 class ProxyScriptFetcher; 48 class ProxyScriptFetcher;
48 class ProxyService; 49 class ProxyService;
49 class SSLConfigService; 50 class SSLConfigService;
50 class URLRequestContext; 51 class URLRequestContext;
51 class URLRequestContextGetter; 52 class URLRequestContextGetter;
52 class URLSecurityManager; 53 class URLSecurityManager;
53 } // namespace net 54 } // namespace net
54 55
55 class IOThread : public BrowserProcessSubThread { 56 class IOThread : public BrowserProcessSubThread {
56 public: 57 public:
57 struct Globals { 58 struct Globals {
58 Globals(); 59 Globals();
59 ~Globals(); 60 ~Globals();
60 61
61 struct MediaGlobals { 62 struct MediaGlobals {
62 MediaGlobals(); 63 MediaGlobals();
63 ~MediaGlobals(); 64 ~MediaGlobals();
64 // MediaInternals singleton used to aggregate media information. 65 // MediaInternals singleton used to aggregate media information.
65 scoped_ptr<MediaInternals> media_internals; 66 scoped_ptr<MediaInternals> media_internals;
66 } media; 67 } media;
67 68
68 // The "system" NetworkDelegate, used for Profile-agnostic network events. 69 // The "system" NetworkDelegate, used for Profile-agnostic network events.
69 scoped_ptr<net::NetworkDelegate> system_network_delegate; 70 scoped_ptr<net::NetworkDelegate> system_network_delegate;
70 scoped_ptr<net::HostResolver> host_resolver; 71 scoped_ptr<net::HostResolver> host_resolver;
71 scoped_ptr<net::CertVerifier> cert_verifier; 72 scoped_ptr<net::CertVerifier> cert_verifier;
73 scoped_ptr<net::OriginBoundCertService> proxy_origin_bound_cert_service;
74 scoped_ptr<net::OriginBoundCertService> system_origin_bound_cert_service;
wtc 2011/08/08 22:49:20 These two members should be put next to the relate
72 scoped_ptr<net::DnsRRResolver> dnsrr_resolver; 75 scoped_ptr<net::DnsRRResolver> dnsrr_resolver;
73 scoped_refptr<net::SSLConfigService> ssl_config_service; 76 scoped_refptr<net::SSLConfigService> ssl_config_service;
74 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; 77 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
75 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; 78 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
76 scoped_ptr<net::HttpTransactionFactory> 79 scoped_ptr<net::HttpTransactionFactory>
77 proxy_script_fetcher_http_transaction_factory; 80 proxy_script_fetcher_http_transaction_factory;
78 scoped_ptr<net::FtpTransactionFactory> 81 scoped_ptr<net::FtpTransactionFactory>
79 proxy_script_fetcher_ftp_transaction_factory; 82 proxy_script_fetcher_ftp_transaction_factory;
80 scoped_ptr<net::URLSecurityManager> url_security_manager; 83 scoped_ptr<net::URLSecurityManager> url_security_manager;
81 // We use a separate URLRequestContext for PAC fetches, in order to break 84 // We use a separate URLRequestContext for PAC fetches, in order to break
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 // ChromeURLRequestContexts can be released during 241 // ChromeURLRequestContexts can be released during
239 // IOThread::CleanUp(). 242 // IOThread::CleanUp().
240 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_; 243 std::list<ChromeURLRequestContextGetter*> url_request_context_getters_;
241 244
242 ScopedRunnableMethodFactory<IOThread> method_factory_; 245 ScopedRunnableMethodFactory<IOThread> method_factory_;
243 246
244 DISALLOW_COPY_AND_ASSIGN(IOThread); 247 DISALLOW_COPY_AND_ASSIGN(IOThread);
245 }; 248 };
246 249
247 #endif // CHROME_BROWSER_IO_THREAD_H_ 250 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | chrome/browser/io_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698