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

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

Issue 53763003: Initialize per-ChromeOS-user NSS slots and provide the functions to access them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r235279 Created 7 years, 1 month 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
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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 } 167 }
168 168
169 BooleanPrefMember* signin_allowed() const { 169 BooleanPrefMember* signin_allowed() const {
170 return &signin_allowed_; 170 return &signin_allowed_;
171 } 171 }
172 172
173 net::TransportSecurityState* transport_security_state() const { 173 net::TransportSecurityState* transport_security_state() const {
174 return transport_security_state_.get(); 174 return transport_security_state_.get();
175 } 175 }
176 176
177 #if defined(OS_CHROMEOS)
178 std::string username_hash() const {
179 return username_hash_;
180 }
181 #endif
182
177 bool is_incognito() const { 183 bool is_incognito() const {
178 return is_incognito_; 184 return is_incognito_;
179 } 185 }
180 186
181 chrome_browser_net::ResourcePrefetchPredictorObserver* 187 chrome_browser_net::ResourcePrefetchPredictorObserver*
182 resource_prefetch_predictor_observer() const { 188 resource_prefetch_predictor_observer() const {
183 return resource_prefetch_predictor_observer_.get(); 189 return resource_prefetch_predictor_observer_.get();
184 } 190 }
185 191
186 #if defined(ENABLE_MANAGED_USERS) 192 #if defined(ENABLE_MANAGED_USERS)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 266
261 // We need to initialize the ProxyConfigService from the UI thread 267 // We need to initialize the ProxyConfigService from the UI thread
262 // because on linux it relies on initializing things through gconf, 268 // because on linux it relies on initializing things through gconf,
263 // and needs to be on the main thread. 269 // and needs to be on the main thread.
264 scoped_ptr<net::ProxyConfigService> proxy_config_service; 270 scoped_ptr<net::ProxyConfigService> proxy_config_service;
265 271
266 #if defined(ENABLE_MANAGED_USERS) 272 #if defined(ENABLE_MANAGED_USERS)
267 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; 273 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
268 #endif 274 #endif
269 275
276 #if defined(OS_CHROMEOS)
277 std::string username_hash;
278 #endif
279
270 // The profile this struct was populated from. It's passed as a void* to 280 // The profile this struct was populated from. It's passed as a void* to
271 // ensure it's not accidently used on the IO thread. Before using it on the 281 // ensure it's not accidently used on the IO thread. Before using it on the
272 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 282 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
273 void* profile; 283 void* profile;
274 }; 284 };
275 285
276 explicit ProfileIOData(bool is_incognito); 286 explicit ProfileIOData(bool is_incognito);
277 287
278 static std::string GetSSLSessionCacheShard(); 288 static std::string GetSSLSessionCacheShard();
279 289
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 491 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
482 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 492 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
483 mutable scoped_ptr<net::FraudulentCertificateReporter> 493 mutable scoped_ptr<net::FraudulentCertificateReporter>
484 fraudulent_certificate_reporter_; 494 fraudulent_certificate_reporter_;
485 mutable scoped_ptr<net::ProxyService> proxy_service_; 495 mutable scoped_ptr<net::ProxyService> proxy_service_;
486 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 496 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
487 mutable scoped_ptr<net::HttpServerProperties> 497 mutable scoped_ptr<net::HttpServerProperties>
488 http_server_properties_; 498 http_server_properties_;
489 #if defined(OS_CHROMEOS) 499 #if defined(OS_CHROMEOS)
490 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; 500 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
501 mutable std::string username_hash_;
491 #endif 502 #endif
492 503
493 mutable scoped_ptr<net::TransportSecurityPersister> 504 mutable scoped_ptr<net::TransportSecurityPersister>
494 transport_security_persister_; 505 transport_security_persister_;
495 506
496 // These are only valid in between LazyInitialize() and their accessor being 507 // These are only valid in between LazyInitialize() and their accessor being
497 // called. 508 // called.
498 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_; 509 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_;
499 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_; 510 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_;
500 // One URLRequestContext per isolated app for main and media requests. 511 // One URLRequestContext per isolated app for main and media requests.
(...skipping 20 matching lines...) Expand all
521 532
522 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 533 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
523 bool initialized_on_UI_thread_; 534 bool initialized_on_UI_thread_;
524 535
525 bool is_incognito_; 536 bool is_incognito_;
526 537
527 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 538 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
528 }; 539 };
529 540
530 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 541 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698