OLD | NEW |
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_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 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that | 550 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that |
551 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. | 551 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. |
552 mutable policy::PolicyCertVerifier* policy_cert_verifier_; | 552 mutable policy::PolicyCertVerifier* policy_cert_verifier_; |
553 mutable scoped_ptr<net::CertVerifier> cert_verifier_; | 553 mutable scoped_ptr<net::CertVerifier> cert_verifier_; |
554 mutable std::string username_hash_; | 554 mutable std::string username_hash_; |
555 mutable bool use_system_key_slot_; | 555 mutable bool use_system_key_slot_; |
556 #endif | 556 #endif |
557 | 557 |
558 mutable scoped_ptr<net::TransportSecurityPersister> | 558 mutable scoped_ptr<net::TransportSecurityPersister> |
559 transport_security_persister_; | 559 transport_security_persister_; |
| 560 mutable scoped_ptr<net::TransportSecurityState::Reporter> |
| 561 transport_security_reporter_; |
560 | 562 |
561 // These are only valid in between LazyInitialize() and their accessor being | 563 // These are only valid in between LazyInitialize() and their accessor being |
562 // called. | 564 // called. |
563 mutable scoped_ptr<net::URLRequestContext> main_request_context_; | 565 mutable scoped_ptr<net::URLRequestContext> main_request_context_; |
564 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; | 566 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; |
565 // One URLRequestContext per isolated app for main and media requests. | 567 // One URLRequestContext per isolated app for main and media requests. |
566 mutable URLRequestContextMap app_request_context_map_; | 568 mutable URLRequestContextMap app_request_context_map_; |
567 mutable URLRequestContextMap isolated_media_request_context_map_; | 569 mutable URLRequestContextMap isolated_media_request_context_map_; |
568 | 570 |
569 mutable scoped_ptr<ResourceContext> resource_context_; | 571 mutable scoped_ptr<ResourceContext> resource_context_; |
(...skipping 23 matching lines...) Expand all Loading... |
593 | 595 |
594 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 596 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
595 bool initialized_on_UI_thread_; | 597 bool initialized_on_UI_thread_; |
596 | 598 |
597 const Profile::ProfileType profile_type_; | 599 const Profile::ProfileType profile_type_; |
598 | 600 |
599 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 601 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
600 }; | 602 }; |
601 | 603 |
602 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 604 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |