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

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

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 | « chrome/browser/extensions/extension_function_registry.cc ('k') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 17 matching lines...) Expand all
28 28
29 namespace net { 29 namespace net {
30 class CertVerifier; 30 class CertVerifier;
31 class CookieStore; 31 class CookieStore;
32 class FtpTransactionFactory; 32 class FtpTransactionFactory;
33 class HostResolver; 33 class HostResolver;
34 class HttpAuthHandlerFactory; 34 class HttpAuthHandlerFactory;
35 class HttpServerProperties; 35 class HttpServerProperties;
36 class HttpTransactionFactory; 36 class HttpTransactionFactory;
37 class NetworkDelegate; 37 class NetworkDelegate;
38 class OriginBoundCertService; 38 class ServerBoundCertService;
39 class ProxyConfigService; 39 class ProxyConfigService;
40 class ProxyService; 40 class ProxyService;
41 class SdchManager; 41 class SdchManager;
42 class SSLConfigService; 42 class SSLConfigService;
43 class TransportSecurityState; 43 class TransportSecurityState;
44 class URLRequestContext; 44 class URLRequestContext;
45 class URLRequestContextGetter; 45 class URLRequestContextGetter;
46 class URLSecurityManager; 46 class URLSecurityManager;
47 } // namespace net 47 } // namespace net
48 48
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // the reference cycle: 86 // the reference cycle:
87 // URLRequestContext=>PAC fetch=>URLRequest=>URLRequestContext. 87 // URLRequestContext=>PAC fetch=>URLRequest=>URLRequestContext.
88 // The first URLRequestContext is |system_url_request_context|. We introduce 88 // The first URLRequestContext is |system_url_request_context|. We introduce
89 // |proxy_script_fetcher_context| for the second context. It has a direct 89 // |proxy_script_fetcher_context| for the second context. It has a direct
90 // ProxyService, since we always directly connect to fetch the PAC script. 90 // ProxyService, since we always directly connect to fetch the PAC script.
91 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context; 91 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context;
92 scoped_ptr<net::ProxyService> system_proxy_service; 92 scoped_ptr<net::ProxyService> system_proxy_service;
93 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; 93 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory;
94 scoped_ptr<net::FtpTransactionFactory> system_ftp_transaction_factory; 94 scoped_ptr<net::FtpTransactionFactory> system_ftp_transaction_factory;
95 scoped_refptr<net::URLRequestContext> system_request_context; 95 scoped_refptr<net::URLRequestContext> system_request_context;
96 // |system_cookie_store| and |system_origin_bound_cert_service| are shared 96 // |system_cookie_store| and |system_server_bound_cert_service| are shared
97 // between |proxy_script_fetcher_context| and |system_request_context|. 97 // between |proxy_script_fetcher_context| and |system_request_context|.
98 scoped_refptr<net::CookieStore> system_cookie_store; 98 scoped_refptr<net::CookieStore> system_cookie_store;
99 scoped_ptr<net::OriginBoundCertService> system_origin_bound_cert_service; 99 scoped_ptr<net::ServerBoundCertService> system_server_bound_cert_service;
100 scoped_refptr<ExtensionEventRouterForwarder> 100 scoped_refptr<ExtensionEventRouterForwarder>
101 extension_event_router_forwarder; 101 extension_event_router_forwarder;
102 }; 102 };
103 103
104 // |net_log| must either outlive the IOThread or be NULL. 104 // |net_log| must either outlive the IOThread or be NULL.
105 IOThread(PrefService* local_state, 105 IOThread(PrefService* local_state,
106 ChromeNetLog* net_log, 106 ChromeNetLog* net_log,
107 ExtensionEventRouterForwarder* extension_event_router_forwarder); 107 ExtensionEventRouterForwarder* extension_event_router_forwarder);
108 108
109 virtual ~IOThread(); 109 virtual ~IOThread();
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 system_url_request_context_getter_; 201 system_url_request_context_getter_;
202 202
203 net::SdchManager* sdch_manager_; 203 net::SdchManager* sdch_manager_;
204 204
205 base::WeakPtrFactory<IOThread> weak_factory_; 205 base::WeakPtrFactory<IOThread> weak_factory_;
206 206
207 DISALLOW_COPY_AND_ASSIGN(IOThread); 207 DISALLOW_COPY_AND_ASSIGN(IOThread);
208 }; 208 };
209 209
210 #endif // CHROME_BROWSER_IO_THREAD_H_ 210 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_registry.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698