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

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

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix/Extend NetworkConfigurationUpdater unit test. 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 26 matching lines...) Expand all
37 class ProtocolHandlerRegistry; 37 class ProtocolHandlerRegistry;
38 class SigninNamesOnIOThread; 38 class SigninNamesOnIOThread;
39 class TransportSecurityPersister; 39 class TransportSecurityPersister;
40 40
41 namespace chrome_browser_net { 41 namespace chrome_browser_net {
42 class LoadTimeStats; 42 class LoadTimeStats;
43 class ResourcePrefetchPredictorObserver; 43 class ResourcePrefetchPredictorObserver;
44 } 44 }
45 45
46 namespace net { 46 namespace net {
47 class CertVerifier;
48 class CookieStore; 47 class CookieStore;
49 class FraudulentCertificateReporter; 48 class FraudulentCertificateReporter;
50 class FtpTransactionFactory; 49 class FtpTransactionFactory;
51 class HttpServerProperties; 50 class HttpServerProperties;
52 class HttpTransactionFactory; 51 class HttpTransactionFactory;
53 class ServerBoundCertService; 52 class ServerBoundCertService;
54 class ProxyConfigService; 53 class ProxyConfigService;
55 class ProxyService; 54 class ProxyService;
56 class SSLConfigService; 55 class SSLConfigService;
57 class TransportSecurityState; 56 class TransportSecurityState;
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 266
268 // We need to initialize the ProxyConfigService from the UI thread 267 // We need to initialize the ProxyConfigService from the UI thread
269 // because on linux it relies on initializing things through gconf, 268 // because on linux it relies on initializing things through gconf,
270 // and needs to be on the main thread. 269 // and needs to be on the main thread.
271 scoped_ptr<net::ProxyConfigService> proxy_config_service; 270 scoped_ptr<net::ProxyConfigService> proxy_config_service;
272 271
273 #if defined(ENABLE_MANAGED_USERS) 272 #if defined(ENABLE_MANAGED_USERS)
274 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; 273 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
275 #endif 274 #endif
276 275
277 #if defined(OS_CHROMEOS)
278 scoped_ptr<policy::PolicyCertVerifier> cert_verifier;
279 #endif
280
281 // The profile this struct was populated from. It's passed as a void* to 276 // The profile this struct was populated from. It's passed as a void* to
282 // ensure it's not accidently used on the IO thread. Before using it on the 277 // ensure it's not accidently used on the IO thread. Before using it on the
283 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 278 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
284 void* profile; 279 void* profile;
285 }; 280 };
286 281
287 explicit ProfileIOData(bool is_incognito); 282 explicit ProfileIOData(bool is_incognito);
288 283
289 static std::string GetSSLSessionCacheShard(); 284 static std::string GetSSLSessionCacheShard();
290 285
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_; 486 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
492 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 487 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
493 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 488 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
494 mutable scoped_ptr<net::FraudulentCertificateReporter> 489 mutable scoped_ptr<net::FraudulentCertificateReporter>
495 fraudulent_certificate_reporter_; 490 fraudulent_certificate_reporter_;
496 mutable scoped_ptr<net::ProxyService> proxy_service_; 491 mutable scoped_ptr<net::ProxyService> proxy_service_;
497 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 492 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
498 mutable scoped_ptr<net::HttpServerProperties> 493 mutable scoped_ptr<net::HttpServerProperties>
499 http_server_properties_; 494 http_server_properties_;
500 #if defined(OS_CHROMEOS) 495 #if defined(OS_CHROMEOS)
501 mutable scoped_ptr<net::CertVerifier> cert_verifier_; 496 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
502 #endif 497 #endif
503 498
504 #if defined(ENABLE_NOTIFICATIONS) 499 #if defined(ENABLE_NOTIFICATIONS)
505 mutable DesktopNotificationService* notification_service_; 500 mutable DesktopNotificationService* notification_service_;
506 #endif 501 #endif
507 502
508 mutable scoped_ptr<TransportSecurityPersister> 503 mutable scoped_ptr<TransportSecurityPersister>
509 transport_security_persister_; 504 transport_security_persister_;
510 505
511 // These are only valid in between LazyInitialize() and their accessor being 506 // These are only valid in between LazyInitialize() and their accessor being
(...skipping 24 matching lines...) Expand all
536 531
537 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 532 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
538 bool initialized_on_UI_thread_; 533 bool initialized_on_UI_thread_;
539 534
540 bool is_incognito_; 535 bool is_incognito_;
541 536
542 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 537 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
543 }; 538 };
544 539
545 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 540 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698