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

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: Use callback_list in PolicyCertVerifier. Created 7 years, 2 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
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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_; 490 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
491 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 491 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
492 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 492 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
493 mutable scoped_ptr<net::FraudulentCertificateReporter> 493 mutable scoped_ptr<net::FraudulentCertificateReporter>
494 fraudulent_certificate_reporter_; 494 fraudulent_certificate_reporter_;
495 mutable scoped_ptr<net::ProxyService> proxy_service_; 495 mutable scoped_ptr<net::ProxyService> proxy_service_;
496 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 496 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
497 mutable scoped_ptr<net::HttpServerProperties> 497 mutable scoped_ptr<net::HttpServerProperties>
498 http_server_properties_; 498 http_server_properties_;
499 #if defined(OS_CHROMEOS) 499 #if defined(OS_CHROMEOS)
500 mutable scoped_ptr<net::CertVerifier> cert_verifier_; 500 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
501 #endif 501 #endif
502 502
503 #if defined(ENABLE_NOTIFICATIONS) 503 #if defined(ENABLE_NOTIFICATIONS)
504 mutable DesktopNotificationService* notification_service_; 504 mutable DesktopNotificationService* notification_service_;
505 #endif 505 #endif
506 506
507 mutable scoped_ptr<TransportSecurityPersister> 507 mutable scoped_ptr<TransportSecurityPersister>
508 transport_security_persister_; 508 transport_security_persister_;
509 509
510 // These are only valid in between LazyInitialize() and their accessor being 510 // These are only valid in between LazyInitialize() and their accessor being
(...skipping 24 matching lines...) Expand all
535 535
536 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 536 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
537 bool initialized_on_UI_thread_; 537 bool initialized_on_UI_thread_;
538 538
539 bool is_incognito_; 539 bool is_incognito_;
540 540
541 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 541 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
542 }; 542 };
543 543
544 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 544 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698