OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "chrome/browser/profile.h" | 5 #include "chrome/browser/profile.h" |
6 | 6 |
7 #include "app/theme_provider.h" | 7 #include "app/theme_provider.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
877 ssl_host_state_.reset(new SSLHostState()); | 877 ssl_host_state_.reset(new SSLHostState()); |
878 | 878 |
879 DCHECK(ssl_host_state_->CalledOnValidThread()); | 879 DCHECK(ssl_host_state_->CalledOnValidThread()); |
880 return ssl_host_state_.get(); | 880 return ssl_host_state_.get(); |
881 } | 881 } |
882 | 882 |
883 net::StrictTransportSecurityState* | 883 net::StrictTransportSecurityState* |
884 ProfileImpl::GetStrictTransportSecurityState() { | 884 ProfileImpl::GetStrictTransportSecurityState() { |
885 if (!strict_transport_security_state_.get()) { | 885 if (!strict_transport_security_state_.get()) { |
886 strict_transport_security_state_ = new net::StrictTransportSecurityState(); | 886 strict_transport_security_state_ = new net::StrictTransportSecurityState(); |
887 strict_transport_security_persister_ = new StrictTransportSecurityPersister( | 887 strict_transport_security_persister_ = |
| 888 new StrictTransportSecurityPersister(); |
| 889 strict_transport_security_persister_->Initialize( |
888 strict_transport_security_state_.get(), path_); | 890 strict_transport_security_state_.get(), path_); |
889 } | 891 } |
890 | 892 |
891 return strict_transport_security_state_.get(); | 893 return strict_transport_security_state_.get(); |
892 } | 894 } |
893 | 895 |
894 PrefService* ProfileImpl::GetPrefs() { | 896 PrefService* ProfileImpl::GetPrefs() { |
895 if (!prefs_.get()) { | 897 if (!prefs_.get()) { |
896 prefs_.reset(new PrefService(GetPrefFilePath())); | 898 prefs_.reset(new PrefService(GetPrefFilePath())); |
897 | 899 |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1439 } | 1441 } |
1440 if (!sync_service_.get()) | 1442 if (!sync_service_.get()) |
1441 InitSyncService(); | 1443 InitSyncService(); |
1442 return sync_service_.get(); | 1444 return sync_service_.get(); |
1443 } | 1445 } |
1444 | 1446 |
1445 void ProfileImpl::InitSyncService() { | 1447 void ProfileImpl::InitSyncService() { |
1446 sync_service_.reset(new ProfileSyncService(this)); | 1448 sync_service_.reset(new ProfileSyncService(this)); |
1447 sync_service_->Initialize(); | 1449 sync_service_->Initialize(); |
1448 } | 1450 } |
OLD | NEW |