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_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ | 5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ |
6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ | 6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/hash_tables.h" | 12 #include "base/hash_tables.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "chrome/browser/profiles/profile_io_data.h" | 15 #include "chrome/browser/profiles/profile_io_data.h" |
16 | 16 |
17 class ChromeURLRequestContext; | 17 class ChromeURLRequestContext; |
18 class ChromeURLRequestContextGetter; | 18 class ChromeURLRequestContextGetter; |
19 class Profile; | 19 class Profile; |
20 namespace net { | 20 namespace net { |
21 class HttpServerPropertiesImpl; | 21 class HttpServerPropertiesImpl; |
22 class TransportSecurityState; | |
22 } // namespace net | 23 } // namespace net |
23 | 24 |
24 // OffTheRecordProfile owns a OffTheRecordProfileIOData::Handle, which holds a | 25 // OffTheRecordProfile owns a OffTheRecordProfileIOData::Handle, which holds a |
25 // reference to the OffTheRecordProfileIOData. OffTheRecordProfileIOData is | 26 // reference to the OffTheRecordProfileIOData. OffTheRecordProfileIOData is |
26 // intended to own all the objects owned by OffTheRecordProfile which live on | 27 // intended to own all the objects owned by OffTheRecordProfile which live on |
27 // the IO thread, such as, but not limited to, network objects like | 28 // the IO thread, such as, but not limited to, network objects like |
28 // CookieMonster, HttpTransactionFactory, etc. OffTheRecordProfileIOData is | 29 // CookieMonster, HttpTransactionFactory, etc. OffTheRecordProfileIOData is |
29 // owned by the OffTheRecordProfile and OffTheRecordProfileIOData's | 30 // owned by the OffTheRecordProfile and OffTheRecordProfileIOData's |
30 // ChromeURLRequestContexts. When all of them go away, then ProfileIOData will | 31 // ChromeURLRequestContexts. When all of them go away, then ProfileIOData will |
31 // be deleted. Note that the OffTheRecordProfileIOData will typically outlive | 32 // be deleted. Note that the OffTheRecordProfileIOData will typically outlive |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 AcquireMediaRequestContext() const OVERRIDE; | 103 AcquireMediaRequestContext() const OVERRIDE; |
103 virtual scoped_refptr<ChromeURLRequestContext> | 104 virtual scoped_refptr<ChromeURLRequestContext> |
104 AcquireIsolatedAppRequestContext( | 105 AcquireIsolatedAppRequestContext( |
105 scoped_refptr<ChromeURLRequestContext> main_context, | 106 scoped_refptr<ChromeURLRequestContext> main_context, |
106 const std::string& app_id) const OVERRIDE; | 107 const std::string& app_id) const OVERRIDE; |
107 | 108 |
108 mutable scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_; | 109 mutable scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_; |
109 | 110 |
110 mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_; | 111 mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_; |
111 mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_; | 112 mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_; |
113 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | |
wtc
2011/12/20 22:14:42
Can we just use the transport_security_state_ memb
agl
2012/01/03 20:29:50
Ah, yes, we can. Done. (In fact, I've moved the pe
| |
112 | 114 |
113 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileIOData); | 115 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileIOData); |
114 }; | 116 }; |
115 | 117 |
116 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ | 118 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ |
OLD | NEW |