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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "chrome/browser/bookmarks/bookmark_model.h" | 12 #include "chrome/browser/bookmarks/bookmark_model.h" |
13 #include "chrome/browser/browser_list.h" | 13 #include "chrome/browser/browser_list.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/browser_theme_provider.h" | 15 #include "chrome/browser/browser_theme_provider.h" |
16 #include "chrome/browser/download/download_manager.h" | 16 #include "chrome/browser/download/download_manager.h" |
17 #include "chrome/browser/extensions/extension_devtools_manager.h" | 17 #include "chrome/browser/extensions/extension_devtools_manager.h" |
18 #include "chrome/browser/extensions/extension_message_service.h" | 18 #include "chrome/browser/extensions/extension_message_service.h" |
19 #include "chrome/browser/extensions/extension_process_manager.h" | 19 #include "chrome/browser/extensions/extension_process_manager.h" |
20 #include "chrome/browser/extensions/extensions_service.h" | 20 #include "chrome/browser/extensions/extensions_service.h" |
21 #include "chrome/browser/extensions/user_script_master.h" | 21 #include "chrome/browser/extensions/user_script_master.h" |
22 #include "chrome/browser/favicon_service.h" | 22 #include "chrome/browser/favicon_service.h" |
| 23 #include "chrome/browser/force_tls_persister.h" |
23 #include "chrome/browser/history/history.h" | 24 #include "chrome/browser/history/history.h" |
24 #include "chrome/browser/in_process_webkit/webkit_context.h" | 25 #include "chrome/browser/in_process_webkit/webkit_context.h" |
25 #include "chrome/browser/net/chrome_url_request_context.h" | 26 #include "chrome/browser/net/chrome_url_request_context.h" |
26 #include "chrome/browser/net/ssl_config_service_manager.h" | 27 #include "chrome/browser/net/ssl_config_service_manager.h" |
27 #include "chrome/browser/password_manager/password_store_default.h" | 28 #include "chrome/browser/password_manager/password_store_default.h" |
28 #include "chrome/browser/privacy_blacklist/blacklist.h" | 29 #include "chrome/browser/privacy_blacklist/blacklist.h" |
29 #include "chrome/browser/profile_manager.h" | 30 #include "chrome/browser/profile_manager.h" |
30 #include "chrome/browser/renderer_host/render_process_host.h" | 31 #include "chrome/browser/renderer_host/render_process_host.h" |
31 #include "chrome/browser/search_engines/template_url_fetcher.h" | 32 #include "chrome/browser/search_engines/template_url_fetcher.h" |
32 #include "chrome/browser/search_engines/template_url_model.h" | 33 #include "chrome/browser/search_engines/template_url_model.h" |
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
816 | 817 |
817 SSLHostState* ProfileImpl::GetSSLHostState() { | 818 SSLHostState* ProfileImpl::GetSSLHostState() { |
818 if (!ssl_host_state_.get()) | 819 if (!ssl_host_state_.get()) |
819 ssl_host_state_.reset(new SSLHostState()); | 820 ssl_host_state_.reset(new SSLHostState()); |
820 | 821 |
821 DCHECK(ssl_host_state_->CalledOnValidThread()); | 822 DCHECK(ssl_host_state_->CalledOnValidThread()); |
822 return ssl_host_state_.get(); | 823 return ssl_host_state_.get(); |
823 } | 824 } |
824 | 825 |
825 net::ForceTLSState* ProfileImpl::GetForceTLSState() { | 826 net::ForceTLSState* ProfileImpl::GetForceTLSState() { |
826 if (!force_tls_state_.get()) | 827 if (!force_tls_state_.get()) { |
827 force_tls_state_.reset(new net::ForceTLSState()); | 828 force_tls_state_ = new net::ForceTLSState(); |
| 829 force_tls_persister_ = new ForceTLSPersister( |
| 830 force_tls_state_.get(), g_browser_process->file_thread()); |
| 831 } |
828 | 832 |
829 return force_tls_state_.get(); | 833 return force_tls_state_.get(); |
830 } | 834 } |
831 | 835 |
832 PrefService* ProfileImpl::GetPrefs() { | 836 PrefService* ProfileImpl::GetPrefs() { |
833 if (!prefs_.get()) { | 837 if (!prefs_.get()) { |
834 prefs_.reset(new PrefService(GetPrefFilePath(), | 838 prefs_.reset(new PrefService(GetPrefFilePath(), |
835 g_browser_process->file_thread())); | 839 g_browser_process->file_thread())); |
836 | 840 |
837 // The Profile class and ProfileManager class may read some prefs so | 841 // The Profile class and ProfileManager class may read some prefs so |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1312 #endif | 1316 #endif |
1313 return NULL; | 1317 return NULL; |
1314 } | 1318 } |
1315 | 1319 |
1316 void ProfileImpl::InitSyncService() { | 1320 void ProfileImpl::InitSyncService() { |
1317 #ifdef CHROME_PERSONALIZATION | 1321 #ifdef CHROME_PERSONALIZATION |
1318 sync_service_.reset(new ProfileSyncService(this)); | 1322 sync_service_.reset(new ProfileSyncService(this)); |
1319 sync_service_->Initialize(); | 1323 sync_service_->Initialize(); |
1320 #endif | 1324 #endif |
1321 } | 1325 } |
OLD | NEW |