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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 8997012: Make incognito windows not inherit HSTS state from the main profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: g try Created 8 years, 11 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
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_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 class ChromeBlobStorageContext; 25 class ChromeBlobStorageContext;
26 class CookieSettings; 26 class CookieSettings;
27 class DesktopNotificationService; 27 class DesktopNotificationService;
28 class DownloadIdFactory; 28 class DownloadIdFactory;
29 class ExtensionInfoMap; 29 class ExtensionInfoMap;
30 class HostContentSettingsMap; 30 class HostContentSettingsMap;
31 class HostZoomMap; 31 class HostZoomMap;
32 class IOThread; 32 class IOThread;
33 class Profile; 33 class Profile;
34 class ProtocolHandlerRegistry; 34 class ProtocolHandlerRegistry;
35 class TransportSecurityPersister;
36 35
37 namespace fileapi { 36 namespace fileapi {
38 class FileSystemContext; 37 class FileSystemContext;
39 } // namespace fileapi 38 } // namespace fileapi
40 39
41 namespace media_stream { 40 namespace media_stream {
42 class MediaStreamManager; 41 class MediaStreamManager;
43 } // namespace media_stream 42 } // namespace media_stream
44 43
45 namespace net { 44 namespace net {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 } 212 }
214 213
215 net::URLRequestJobFactory* job_factory() const { 214 net::URLRequestJobFactory* job_factory() const {
216 return job_factory_.get(); 215 return job_factory_.get();
217 } 216 }
218 217
219 ChromeURLRequestContext* main_request_context() const { 218 ChromeURLRequestContext* main_request_context() const {
220 return main_request_context_; 219 return main_request_context_;
221 } 220 }
222 221
222 protected:
223 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
224
223 private: 225 private:
224 class ResourceContext : public content::ResourceContext { 226 class ResourceContext : public content::ResourceContext {
225 public: 227 public:
226 explicit ResourceContext(const ProfileIOData* io_data); 228 explicit ResourceContext(const ProfileIOData* io_data);
227 virtual ~ResourceContext(); 229 virtual ~ResourceContext();
228 230
229 private: 231 private:
230 virtual void EnsureInitialized() const OVERRIDE; 232 virtual void EnsureInitialized() const OVERRIDE;
231 233
232 const ProfileIOData* const io_data_; 234 const ProfileIOData* const io_data_;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; 276 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
275 277
276 // Pointed to by URLRequestContext. 278 // Pointed to by URLRequestContext.
277 mutable scoped_ptr<ChromeURLDataManagerBackend> 279 mutable scoped_ptr<ChromeURLDataManagerBackend>
278 chrome_url_data_manager_backend_; 280 chrome_url_data_manager_backend_;
279 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_; 281 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
280 mutable scoped_ptr<net::NetworkDelegate> network_delegate_; 282 mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
281 mutable scoped_ptr<net::FraudulentCertificateReporter> 283 mutable scoped_ptr<net::FraudulentCertificateReporter>
282 fraudulent_certificate_reporter_; 284 fraudulent_certificate_reporter_;
283 mutable scoped_ptr<net::ProxyService> proxy_service_; 285 mutable scoped_ptr<net::ProxyService> proxy_service_;
284 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
285 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_; 286 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
286 287
287 // Pointed to by ResourceContext. 288 // Pointed to by ResourceContext.
288 mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_; 289 mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
289 mutable scoped_refptr<ChromeAppCacheService> appcache_service_; 290 mutable scoped_refptr<ChromeAppCacheService> appcache_service_;
290 mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_; 291 mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
291 mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_; 292 mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
292 mutable scoped_refptr<quota::QuotaManager> quota_manager_; 293 mutable scoped_refptr<quota::QuotaManager> quota_manager_;
293 mutable scoped_refptr<HostZoomMap> host_zoom_map_; 294 mutable scoped_refptr<HostZoomMap> host_zoom_map_;
294 mutable scoped_refptr<DownloadIdFactory> download_id_factory_; 295 mutable scoped_refptr<DownloadIdFactory> download_id_factory_;
295 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 296 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
296 297
297 // TODO(willchan): Remove from ResourceContext. 298 // TODO(willchan): Remove from ResourceContext.
298 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_; 299 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
299 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 300 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
300 mutable scoped_refptr<CookieSettings> cookie_settings_; 301 mutable scoped_refptr<CookieSettings> cookie_settings_;
301 mutable DesktopNotificationService* notification_service_; 302 mutable DesktopNotificationService* notification_service_;
302 303
303 mutable ResourceContext resource_context_; 304 mutable ResourceContext resource_context_;
304 305
305 mutable scoped_ptr<TransportSecurityPersister>
306 transport_security_persister_;
307
308 // These are only valid in between LazyInitialize() and their accessor being 306 // These are only valid in between LazyInitialize() and their accessor being
309 // called. 307 // called.
310 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; 308 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
311 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; 309 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
312 // One AppRequestContext per isolated app. 310 // One AppRequestContext per isolated app.
313 mutable AppRequestContextMap app_request_context_map_; 311 mutable AppRequestContextMap app_request_context_map_;
314 312
315 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 313 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
316 bool initialized_on_UI_thread_; 314 bool initialized_on_UI_thread_;
317 315
318 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 316 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
319 }; 317 };
320 318
321 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 319 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698