OLD | NEW |
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 #include "chrome/browser/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 #include "chrome/browser/extensions/extension_special_storage_policy.h" | 136 #include "chrome/browser/extensions/extension_special_storage_policy.h" |
137 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 137 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
138 #include "extensions/browser/extension_pref_store.h" | 138 #include "extensions/browser/extension_pref_store.h" |
139 #include "extensions/browser/extension_pref_value_map.h" | 139 #include "extensions/browser/extension_pref_value_map.h" |
140 #include "extensions/browser/extension_pref_value_map_factory.h" | 140 #include "extensions/browser/extension_pref_value_map_factory.h" |
141 #include "extensions/browser/extension_system.h" | 141 #include "extensions/browser/extension_system.h" |
142 #include "extensions/browser/guest_view/guest_view_manager.h" | 142 #include "extensions/browser/guest_view/guest_view_manager.h" |
143 #endif | 143 #endif |
144 | 144 |
145 #if defined(ENABLE_SUPERVISED_USERS) | 145 #if defined(ENABLE_SUPERVISED_USERS) |
| 146 #include "chrome/browser/content_settings/content_settings_supervised_provider.h
" |
146 #include "chrome/browser/supervised_user/supervised_user_constants.h" | 147 #include "chrome/browser/supervised_user/supervised_user_constants.h" |
147 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" | 148 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" |
148 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" | 149 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" |
149 #endif | 150 #endif |
150 | 151 |
151 using base::Time; | 152 using base::Time; |
152 using base::TimeDelta; | 153 using base::TimeDelta; |
153 using base::UserMetricsAction; | 154 using base::UserMetricsAction; |
154 using bookmarks::BookmarkModel; | 155 using bookmarks::BookmarkModel; |
155 using content::BrowserThread; | 156 using content::BrowserThread; |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 #if defined(OS_CHROMEOS) | 469 #if defined(OS_CHROMEOS) |
469 if (chromeos::ProfileHelper::IsSigninProfile(this)) | 470 if (chromeos::ProfileHelper::IsSigninProfile(this)) |
470 chrome::RegisterLoginProfilePrefs(pref_registry_.get()); | 471 chrome::RegisterLoginProfilePrefs(pref_registry_.get()); |
471 else | 472 else |
472 #endif | 473 #endif |
473 chrome::RegisterUserProfilePrefs(pref_registry_.get()); | 474 chrome::RegisterUserProfilePrefs(pref_registry_.get()); |
474 | 475 |
475 BrowserContextDependencyManager::GetInstance()-> | 476 BrowserContextDependencyManager::GetInstance()-> |
476 RegisterProfilePrefsForServices(this, pref_registry_.get()); | 477 RegisterProfilePrefsForServices(this, pref_registry_.get()); |
477 | 478 |
478 SupervisedUserSettingsService* supervised_user_settings = NULL; | 479 SupervisedUserSettingsService* supervised_user_settings = nullptr; |
479 #if defined(ENABLE_SUPERVISED_USERS) | 480 #if defined(ENABLE_SUPERVISED_USERS) |
480 supervised_user_settings = | 481 supervised_user_settings = |
481 SupervisedUserSettingsServiceFactory::GetForProfile(this); | 482 SupervisedUserSettingsServiceFactory::GetForProfile(this); |
482 supervised_user_settings->Init( | 483 supervised_user_settings->Init( |
483 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); | 484 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); |
484 #endif | 485 #endif |
485 | 486 |
486 scoped_refptr<SafeBrowsingService> safe_browsing_service( | 487 scoped_refptr<SafeBrowsingService> safe_browsing_service( |
487 g_browser_process->safe_browsing_service()); | 488 g_browser_process->safe_browsing_service()); |
488 if (safe_browsing_service.get()) { | 489 if (safe_browsing_service.get()) { |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 // http://crbug.com/171406). | 1034 // http://crbug.com/171406). |
1034 DCHECK(ssl_config_service_manager_) << | 1035 DCHECK(ssl_config_service_manager_) << |
1035 "SSLConfigServiceManager is not initialized yet"; | 1036 "SSLConfigServiceManager is not initialized yet"; |
1036 return ssl_config_service_manager_->Get(); | 1037 return ssl_config_service_manager_->Get(); |
1037 } | 1038 } |
1038 | 1039 |
1039 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { | 1040 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { |
1040 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 1041 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
1041 if (!host_content_settings_map_.get()) { | 1042 if (!host_content_settings_map_.get()) { |
1042 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); | 1043 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); |
| 1044 #if defined(ENABLE_SUPERVISED_USERS) |
| 1045 SupervisedUserSettingsService* supervised_user_settings = |
| 1046 SupervisedUserSettingsServiceFactory::GetForProfile(this); |
| 1047 scoped_ptr<content_settings::SupervisedProvider> supervised_provider( |
| 1048 new content_settings::SupervisedProvider(supervised_user_settings)); |
| 1049 host_content_settings_map_->RegisterProvider( |
| 1050 HostContentSettingsMap::SUPERVISED_PROVIDER, |
| 1051 supervised_provider.Pass()); |
| 1052 #endif |
1043 } | 1053 } |
1044 return host_content_settings_map_.get(); | 1054 return host_content_settings_map_.get(); |
1045 } | 1055 } |
1046 | 1056 |
1047 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { | 1057 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
1048 #if defined(ENABLE_EXTENSIONS) | 1058 #if defined(ENABLE_EXTENSIONS) |
1049 return extensions::GuestViewManager::FromBrowserContext(this); | 1059 return extensions::GuestViewManager::FromBrowserContext(this); |
1050 #else | 1060 #else |
1051 return NULL; | 1061 return NULL; |
1052 #endif | 1062 #endif |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1323 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1333 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1324 domain_reliability::DomainReliabilityService* service = | 1334 domain_reliability::DomainReliabilityService* service = |
1325 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1335 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1326 GetForBrowserContext(this); | 1336 GetForBrowserContext(this); |
1327 if (!service) | 1337 if (!service) |
1328 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1338 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1329 | 1339 |
1330 return service->CreateMonitor( | 1340 return service->CreateMonitor( |
1331 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1341 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1332 } | 1342 } |
OLD | NEW |