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

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

Issue 424523002: Enable system NSS key slot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compilation of profile_io_data on !OS_CHROMEOS. Created 6 years, 4 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
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 10
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 } 206 }
207 207
208 net::TransportSecurityState* transport_security_state() const { 208 net::TransportSecurityState* transport_security_state() const {
209 return transport_security_state_.get(); 209 return transport_security_state_.get();
210 } 210 }
211 211
212 #if defined(OS_CHROMEOS) 212 #if defined(OS_CHROMEOS)
213 std::string username_hash() const { 213 std::string username_hash() const {
214 return username_hash_; 214 return username_hash_;
215 } 215 }
216
217 bool use_system_key_slot() const { return use_system_key_slot_; }
216 #endif 218 #endif
217 219
218 Profile::ProfileType profile_type() const { 220 Profile::ProfileType profile_type() const {
219 return profile_type_; 221 return profile_type_;
220 } 222 }
221 223
222 bool IsOffTheRecord() const; 224 bool IsOffTheRecord() const;
223 225
224 IntegerPrefMember* incognito_availibility() const { 226 IntegerPrefMember* incognito_availibility() const {
225 return &incognito_availibility_pref_; 227 return &incognito_availibility_pref_;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // because on linux it relies on initializing things through gconf, 321 // because on linux it relies on initializing things through gconf,
320 // and needs to be on the main thread. 322 // and needs to be on the main thread.
321 scoped_ptr<net::ProxyConfigService> proxy_config_service; 323 scoped_ptr<net::ProxyConfigService> proxy_config_service;
322 324
323 #if defined(ENABLE_MANAGED_USERS) 325 #if defined(ENABLE_MANAGED_USERS)
324 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; 326 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
325 #endif 327 #endif
326 328
327 #if defined(OS_CHROMEOS) 329 #if defined(OS_CHROMEOS)
328 std::string username_hash; 330 std::string username_hash;
331 bool use_system_key_slot;
329 #endif 332 #endif
330 333
331 // The profile this struct was populated from. It's passed as a void* to 334 // The profile this struct was populated from. It's passed as a void* to
332 // ensure it's not accidently used on the IO thread. Before using it on the 335 // ensure it's not accidently used on the IO thread. Before using it on the
333 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 336 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
334 void* profile; 337 void* profile;
335 338
336 prerender::PrerenderTracker* prerender_tracker; 339 prerender::PrerenderTracker* prerender_tracker;
337 }; 340 };
338 341
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 585 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
583 mutable scoped_ptr<net::FraudulentCertificateReporter> 586 mutable scoped_ptr<net::FraudulentCertificateReporter>
584 fraudulent_certificate_reporter_; 587 fraudulent_certificate_reporter_;
585 mutable scoped_ptr<net::ProxyService> proxy_service_; 588 mutable scoped_ptr<net::ProxyService> proxy_service_;
586 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 589 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
587 mutable scoped_ptr<net::HttpServerProperties> 590 mutable scoped_ptr<net::HttpServerProperties>
588 http_server_properties_; 591 http_server_properties_;
589 #if defined(OS_CHROMEOS) 592 #if defined(OS_CHROMEOS)
590 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; 593 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
591 mutable std::string username_hash_; 594 mutable std::string username_hash_;
595 mutable bool use_system_key_slot_;
592 #endif 596 #endif
593 597
594 mutable scoped_ptr<net::TransportSecurityPersister> 598 mutable scoped_ptr<net::TransportSecurityPersister>
595 transport_security_persister_; 599 transport_security_persister_;
596 600
597 // These are only valid in between LazyInitialize() and their accessor being 601 // These are only valid in between LazyInitialize() and their accessor being
598 // called. 602 // called.
599 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_; 603 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_;
600 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_; 604 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_;
601 // One URLRequestContext per isolated app for main and media requests. 605 // One URLRequestContext per isolated app for main and media requests.
(...skipping 18 matching lines...) Expand all
620 624
621 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 625 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
622 bool initialized_on_UI_thread_; 626 bool initialized_on_UI_thread_;
623 627
624 const Profile::ProfileType profile_type_; 628 const Profile::ProfileType profile_type_;
625 629
626 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 630 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
627 }; 631 };
628 632
629 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 633 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698