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

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

Issue 1232553003: Add new certificateProvider extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 3 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
OLDNEW
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 22 matching lines...) Expand all
33 #include "net/url_request/url_request_job_factory.h" 33 #include "net/url_request/url_request_job_factory.h"
34 34
35 class ChromeHttpUserAgentSettings; 35 class ChromeHttpUserAgentSettings;
36 class ChromeNetworkDelegate; 36 class ChromeNetworkDelegate;
37 class ChromeURLRequestContextGetter; 37 class ChromeURLRequestContextGetter;
38 class HostContentSettingsMap; 38 class HostContentSettingsMap;
39 class MediaDeviceIDSalt; 39 class MediaDeviceIDSalt;
40 class ProtocolHandlerRegistry; 40 class ProtocolHandlerRegistry;
41 class SupervisedUserURLFilter; 41 class SupervisedUserURLFilter;
42 42
43 namespace chromeos {
44 class CertificateProvider;
45 }
46
43 namespace chrome_browser_net { 47 namespace chrome_browser_net {
44 class ResourcePrefetchPredictorObserver; 48 class ResourcePrefetchPredictorObserver;
45 } 49 }
46 50
47 namespace content_settings { 51 namespace content_settings {
48 class CookieSettings; 52 class CookieSettings;
49 } 53 }
50 54
51 namespace data_reduction_proxy { 55 namespace data_reduction_proxy {
52 class DataReductionProxyIOData; 56 class DataReductionProxyIOData;
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // and needs to be on the main thread. 310 // and needs to be on the main thread.
307 scoped_ptr<net::ProxyConfigService> proxy_config_service; 311 scoped_ptr<net::ProxyConfigService> proxy_config_service;
308 312
309 #if defined(ENABLE_SUPERVISED_USERS) 313 #if defined(ENABLE_SUPERVISED_USERS)
310 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; 314 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
311 #endif 315 #endif
312 316
313 #if defined(OS_CHROMEOS) 317 #if defined(OS_CHROMEOS)
314 std::string username_hash; 318 std::string username_hash;
315 bool use_system_key_slot; 319 bool use_system_key_slot;
320 scoped_ptr<chromeos::CertificateProvider> certificate_provider;
316 #endif 321 #endif
317 322
318 // The profile this struct was populated from. It's passed as a void* to 323 // The profile this struct was populated from. It's passed as a void* to
319 // ensure it's not accidently used on the IO thread. Before using it on the 324 // ensure it's not accidently used on the IO thread. Before using it on the
320 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 325 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
321 void* profile; 326 void* profile;
322 }; 327 };
323 328
324 explicit ProfileIOData(Profile::ProfileType profile_type); 329 explicit ProfileIOData(Profile::ProfileType profile_type);
325 330
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 548 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
544 mutable scoped_ptr<net::HttpServerProperties> 549 mutable scoped_ptr<net::HttpServerProperties>
545 http_server_properties_; 550 http_server_properties_;
546 #if defined(OS_CHROMEOS) 551 #if defined(OS_CHROMEOS)
547 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 552 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
548 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 553 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
549 mutable scoped_ptr<net::CertVerifier> cert_verifier_; 554 mutable scoped_ptr<net::CertVerifier> cert_verifier_;
550 mutable policy::PolicyCertVerifier* policy_cert_verifier_; 555 mutable policy::PolicyCertVerifier* policy_cert_verifier_;
551 mutable std::string username_hash_; 556 mutable std::string username_hash_;
552 mutable bool use_system_key_slot_; 557 mutable bool use_system_key_slot_;
558 mutable scoped_ptr<chromeos::CertificateProvider> certificate_provider_;
553 #endif 559 #endif
554 560
555 mutable scoped_ptr<net::TransportSecurityPersister> 561 mutable scoped_ptr<net::TransportSecurityPersister>
556 transport_security_persister_; 562 transport_security_persister_;
557 mutable scoped_ptr<net::CertificateReportSender> certificate_report_sender_; 563 mutable scoped_ptr<net::CertificateReportSender> certificate_report_sender_;
558 564
559 // These are only valid in between LazyInitialize() and their accessor being 565 // These are only valid in between LazyInitialize() and their accessor being
560 // called. 566 // called.
561 mutable scoped_ptr<net::URLRequestContext> main_request_context_; 567 mutable scoped_ptr<net::URLRequestContext> main_request_context_;
562 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; 568 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_;
(...skipping 28 matching lines...) Expand all
591 597
592 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 598 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
593 bool initialized_on_UI_thread_; 599 bool initialized_on_UI_thread_;
594 600
595 const Profile::ProfileType profile_type_; 601 const Profile::ProfileType profile_type_;
596 602
597 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 603 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
598 }; 604 };
599 605
600 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 606 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698