| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "net/cookies/cookie_monster.h" | 32 #include "net/cookies/cookie_monster.h" |
| 33 #include "net/http/http_cache.h" | 33 #include "net/http/http_cache.h" |
| 34 #include "net/http/http_network_session.h" | 34 #include "net/http/http_network_session.h" |
| 35 #include "net/url_request/url_request_context.h" | 35 #include "net/url_request/url_request_context.h" |
| 36 #include "net/url_request/url_request_interceptor.h" | 36 #include "net/url_request/url_request_interceptor.h" |
| 37 #include "net/url_request/url_request_job_factory.h" | 37 #include "net/url_request/url_request_job_factory.h" |
| 38 | 38 |
| 39 class ChromeHttpUserAgentSettings; | 39 class ChromeHttpUserAgentSettings; |
| 40 class ChromeNetworkDelegate; | 40 class ChromeNetworkDelegate; |
| 41 class ChromeURLRequestContextGetter; | 41 class ChromeURLRequestContextGetter; |
| 42 class ChromeExpectCTReporter; |
| 42 class HostContentSettingsMap; | 43 class HostContentSettingsMap; |
| 43 class MediaDeviceIDSalt; | 44 class MediaDeviceIDSalt; |
| 44 class ProtocolHandlerRegistry; | 45 class ProtocolHandlerRegistry; |
| 45 class SupervisedUserURLFilter; | 46 class SupervisedUserURLFilter; |
| 46 | 47 |
| 47 namespace chromeos { | 48 namespace chromeos { |
| 48 class CertificateProvider; | 49 class CertificateProvider; |
| 49 } | 50 } |
| 50 | 51 |
| 51 namespace chrome_browser_net { | 52 namespace chrome_browser_net { |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; | 539 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; |
| 539 #endif | 540 #endif |
| 540 mutable scoped_ptr<net::ChannelIDService> channel_id_service_; | 541 mutable scoped_ptr<net::ChannelIDService> channel_id_service_; |
| 541 | 542 |
| 542 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> | 543 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> |
| 543 data_reduction_proxy_io_data_; | 544 data_reduction_proxy_io_data_; |
| 544 | 545 |
| 545 mutable scoped_ptr<net::ProxyService> proxy_service_; | 546 mutable scoped_ptr<net::ProxyService> proxy_service_; |
| 546 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | 547 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; |
| 547 mutable scoped_ptr<net::CTVerifier> cert_transparency_verifier_; | 548 mutable scoped_ptr<net::CTVerifier> cert_transparency_verifier_; |
| 549 mutable scoped_ptr<ChromeExpectCTReporter> expect_ct_reporter_; |
| 548 mutable scoped_ptr<net::HttpServerProperties> | 550 mutable scoped_ptr<net::HttpServerProperties> |
| 549 http_server_properties_; | 551 http_server_properties_; |
| 550 #if defined(OS_CHROMEOS) | 552 #if defined(OS_CHROMEOS) |
| 551 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that | 553 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that |
| 552 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. | 554 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. |
| 553 mutable scoped_ptr<net::CertVerifier> cert_verifier_; | 555 mutable scoped_ptr<net::CertVerifier> cert_verifier_; |
| 554 mutable policy::PolicyCertVerifier* policy_cert_verifier_; | 556 mutable policy::PolicyCertVerifier* policy_cert_verifier_; |
| 555 mutable std::string username_hash_; | 557 mutable std::string username_hash_; |
| 556 mutable bool use_system_key_slot_; | 558 mutable bool use_system_key_slot_; |
| 557 mutable scoped_ptr<chromeos::CertificateProvider> certificate_provider_; | 559 mutable scoped_ptr<chromeos::CertificateProvider> certificate_provider_; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 | 598 |
| 597 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 599 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 598 bool initialized_on_UI_thread_; | 600 bool initialized_on_UI_thread_; |
| 599 | 601 |
| 600 const Profile::ProfileType profile_type_; | 602 const Profile::ProfileType profile_type_; |
| 601 | 603 |
| 602 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 604 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 603 }; | 605 }; |
| 604 | 606 |
| 605 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 607 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |