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