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 <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 BooleanPrefMember* signin_allowed() const { | 170 BooleanPrefMember* signin_allowed() const { |
171 return &signin_allowed_; | 171 return &signin_allowed_; |
172 } | 172 } |
173 | 173 |
174 std::string GetMediaDeviceIDSalt() const; | 174 std::string GetMediaDeviceIDSalt() const; |
175 | 175 |
176 net::TransportSecurityState* transport_security_state() const { | 176 net::TransportSecurityState* transport_security_state() const { |
177 return transport_security_state_.get(); | 177 return transport_security_state_.get(); |
178 } | 178 } |
179 | 179 |
| 180 #if defined(OS_CHROMEOS) |
| 181 std::string username_hash() const { |
| 182 return username_hash_; |
| 183 } |
| 184 #endif |
| 185 |
180 bool is_incognito() const { | 186 bool is_incognito() const { |
181 return is_incognito_; | 187 return is_incognito_; |
182 } | 188 } |
183 | 189 |
184 chrome_browser_net::ResourcePrefetchPredictorObserver* | 190 chrome_browser_net::ResourcePrefetchPredictorObserver* |
185 resource_prefetch_predictor_observer() const { | 191 resource_prefetch_predictor_observer() const { |
186 return resource_prefetch_predictor_observer_.get(); | 192 return resource_prefetch_predictor_observer_.get(); |
187 } | 193 } |
188 | 194 |
189 #if defined(ENABLE_MANAGED_USERS) | 195 #if defined(ENABLE_MANAGED_USERS) |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 | 269 |
264 // We need to initialize the ProxyConfigService from the UI thread | 270 // We need to initialize the ProxyConfigService from the UI thread |
265 // because on linux it relies on initializing things through gconf, | 271 // because on linux it relies on initializing things through gconf, |
266 // and needs to be on the main thread. | 272 // and needs to be on the main thread. |
267 scoped_ptr<net::ProxyConfigService> proxy_config_service; | 273 scoped_ptr<net::ProxyConfigService> proxy_config_service; |
268 | 274 |
269 #if defined(ENABLE_MANAGED_USERS) | 275 #if defined(ENABLE_MANAGED_USERS) |
270 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; | 276 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; |
271 #endif | 277 #endif |
272 | 278 |
| 279 #if defined(OS_CHROMEOS) |
| 280 std::string username_hash; |
| 281 #endif |
| 282 |
273 // The profile this struct was populated from. It's passed as a void* to | 283 // The profile this struct was populated from. It's passed as a void* to |
274 // ensure it's not accidently used on the IO thread. Before using it on the | 284 // ensure it's not accidently used on the IO thread. Before using it on the |
275 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 285 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
276 void* profile; | 286 void* profile; |
277 }; | 287 }; |
278 | 288 |
279 explicit ProfileIOData(bool is_incognito); | 289 explicit ProfileIOData(bool is_incognito); |
280 | 290 |
281 static std::string GetSSLSessionCacheShard(); | 291 static std::string GetSSLSessionCacheShard(); |
282 | 292 |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; | 497 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; |
488 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; | 498 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; |
489 mutable scoped_ptr<net::FraudulentCertificateReporter> | 499 mutable scoped_ptr<net::FraudulentCertificateReporter> |
490 fraudulent_certificate_reporter_; | 500 fraudulent_certificate_reporter_; |
491 mutable scoped_ptr<net::ProxyService> proxy_service_; | 501 mutable scoped_ptr<net::ProxyService> proxy_service_; |
492 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | 502 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; |
493 mutable scoped_ptr<net::HttpServerProperties> | 503 mutable scoped_ptr<net::HttpServerProperties> |
494 http_server_properties_; | 504 http_server_properties_; |
495 #if defined(OS_CHROMEOS) | 505 #if defined(OS_CHROMEOS) |
496 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; | 506 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; |
| 507 mutable std::string username_hash_; |
497 #endif | 508 #endif |
498 | 509 |
499 mutable scoped_ptr<net::TransportSecurityPersister> | 510 mutable scoped_ptr<net::TransportSecurityPersister> |
500 transport_security_persister_; | 511 transport_security_persister_; |
501 | 512 |
502 // These are only valid in between LazyInitialize() and their accessor being | 513 // These are only valid in between LazyInitialize() and their accessor being |
503 // called. | 514 // called. |
504 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_; | 515 mutable scoped_ptr<ChromeURLRequestContext> main_request_context_; |
505 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_; | 516 mutable scoped_ptr<ChromeURLRequestContext> extensions_request_context_; |
506 // One URLRequestContext per isolated app for main and media requests. | 517 // One URLRequestContext per isolated app for main and media requests. |
(...skipping 20 matching lines...) Expand all Loading... |
527 | 538 |
528 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 539 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
529 bool initialized_on_UI_thread_; | 540 bool initialized_on_UI_thread_; |
530 | 541 |
531 bool is_incognito_; | 542 bool is_incognito_; |
532 | 543 |
533 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 544 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
534 }; | 545 }; |
535 | 546 |
536 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 547 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |