OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" | 40 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" |
41 #include "chrome/browser/history/history.h" | 41 #include "chrome/browser/history/history.h" |
42 #include "chrome/browser/history/shortcuts_backend.h" | 42 #include "chrome/browser/history/shortcuts_backend.h" |
43 #include "chrome/browser/history/top_sites.h" | 43 #include "chrome/browser/history/top_sites.h" |
44 #include "chrome/browser/instant/instant_controller.h" | 44 #include "chrome/browser/instant/instant_controller.h" |
45 #include "chrome/browser/metrics/metrics_service.h" | 45 #include "chrome/browser/metrics/metrics_service.h" |
46 #include "chrome/browser/net/chrome_url_request_context.h" | 46 #include "chrome/browser/net/chrome_url_request_context.h" |
47 #include "chrome/browser/net/gaia/token_service.h" | 47 #include "chrome/browser/net/gaia/token_service.h" |
48 #include "chrome/browser/net/net_pref_observer.h" | 48 #include "chrome/browser/net/net_pref_observer.h" |
49 #include "chrome/browser/net/pref_proxy_config_service.h" | 49 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 50 #include "chrome/browser/net/spdy_config_service_manager.h" |
50 #include "chrome/browser/net/ssl_config_service_manager.h" | 51 #include "chrome/browser/net/ssl_config_service_manager.h" |
51 #include "chrome/browser/password_manager/password_store_default.h" | 52 #include "chrome/browser/password_manager/password_store_default.h" |
52 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 53 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
53 #include "chrome/browser/prefs/browser_prefs.h" | 54 #include "chrome/browser/prefs/browser_prefs.h" |
54 #include "chrome/browser/prefs/pref_value_store.h" | 55 #include "chrome/browser/prefs/pref_value_store.h" |
55 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 56 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
56 #include "chrome/browser/prerender/prerender_manager.h" | 57 #include "chrome/browser/prerender/prerender_manager.h" |
57 #include "chrome/browser/profiles/profile_dependency_manager.h" | 58 #include "chrome/browser/profiles/profile_dependency_manager.h" |
58 #include "chrome/browser/profiles/profile_manager.h" | 59 #include "chrome/browser/profiles/profile_manager.h" |
59 #include "chrome/browser/search_engines/template_url_fetcher.h" | 60 #include "chrome/browser/search_engines/template_url_fetcher.h" |
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
908 | 909 |
909 extension_settings_ = new ExtensionSettings( | 910 extension_settings_ = new ExtensionSettings( |
910 GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName)); | 911 GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName)); |
911 | 912 |
912 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false); | 913 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false); |
913 | 914 |
914 DCHECK(!net_pref_observer_.get()); | 915 DCHECK(!net_pref_observer_.get()); |
915 net_pref_observer_.reset( | 916 net_pref_observer_.reset( |
916 new NetPrefObserver(prefs_.get(), GetPrerenderManager())); | 917 new NetPrefObserver(prefs_.get(), GetPrerenderManager())); |
917 | 918 |
| 919 // Get Spdy preferences from the user_prefs object. |
| 920 if (g_browser_process->spdy_config_service_manager()) { |
| 921 spdy_config_service_manager_ = |
| 922 g_browser_process->spdy_config_service_manager(); |
| 923 spdy_config_service_manager_->Initialize(prefs_.get()); |
| 924 } |
| 925 |
918 DoFinalInit(); | 926 DoFinalInit(); |
919 } | 927 } |
920 | 928 |
921 PrefService* ProfileImpl::GetPrefs() { | 929 PrefService* ProfileImpl::GetPrefs() { |
922 DCHECK(prefs_.get()); // Should explicitly be initialized. | 930 DCHECK(prefs_.get()); // Should explicitly be initialized. |
923 return prefs_.get(); | 931 return prefs_.get(); |
924 } | 932 } |
925 | 933 |
926 PrefService* ProfileImpl::GetOffTheRecordPrefs() { | 934 PrefService* ProfileImpl::GetOffTheRecordPrefs() { |
927 if (!otr_prefs_.get()) { | 935 if (!otr_prefs_.get()) { |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1012 const std::string& extension_id, | 1020 const std::string& extension_id, |
1013 const extension_misc::UnloadedExtensionReason reason) { | 1021 const extension_misc::UnloadedExtensionReason reason) { |
1014 BrowserThread::PostTask( | 1022 BrowserThread::PostTask( |
1015 BrowserThread::IO, FROM_HERE, | 1023 BrowserThread::IO, FROM_HERE, |
1016 NewRunnableMethod(extension_info_map_.get(), | 1024 NewRunnableMethod(extension_info_map_.get(), |
1017 &ExtensionInfoMap::RemoveExtension, | 1025 &ExtensionInfoMap::RemoveExtension, |
1018 extension_id, | 1026 extension_id, |
1019 reason)); | 1027 reason)); |
1020 } | 1028 } |
1021 | 1029 |
| 1030 net::SpdyConfigService* ProfileImpl::GetSpdyConfigService() { |
| 1031 return spdy_config_service_manager_->Get(); |
| 1032 } |
| 1033 |
1022 net::SSLConfigService* ProfileImpl::GetSSLConfigService() { | 1034 net::SSLConfigService* ProfileImpl::GetSSLConfigService() { |
1023 return ssl_config_service_manager_->Get(); | 1035 return ssl_config_service_manager_->Get(); |
1024 } | 1036 } |
1025 | 1037 |
1026 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { | 1038 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { |
1027 if (!host_content_settings_map_.get()) { | 1039 if (!host_content_settings_map_.get()) { |
1028 host_content_settings_map_ = new HostContentSettingsMap( | 1040 host_content_settings_map_ = new HostContentSettingsMap( |
1029 GetPrefs(), GetExtensionService(), false); | 1041 GetPrefs(), GetExtensionService(), false); |
1030 } | 1042 } |
1031 return host_content_settings_map_.get(); | 1043 return host_content_settings_map_.get(); |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1728 #endif | 1740 #endif |
1729 } | 1741 } |
1730 return prerender_manager_.get(); | 1742 return prerender_manager_.get(); |
1731 } | 1743 } |
1732 | 1744 |
1733 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { | 1745 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { |
1734 if (!spellcheck_profile_.get()) | 1746 if (!spellcheck_profile_.get()) |
1735 spellcheck_profile_.reset(new SpellCheckProfile()); | 1747 spellcheck_profile_.reset(new SpellCheckProfile()); |
1736 return spellcheck_profile_.get(); | 1748 return spellcheck_profile_.get(); |
1737 } | 1749 } |
OLD | NEW |