| 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 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 RegisterProfilePrefsForServices(this, pref_registry_.get()); | 444 RegisterProfilePrefsForServices(this, pref_registry_.get()); |
| 445 | 445 |
| 446 SupervisedUserSettingsService* supervised_user_settings = nullptr; | 446 SupervisedUserSettingsService* supervised_user_settings = nullptr; |
| 447 #if defined(ENABLE_SUPERVISED_USERS) | 447 #if defined(ENABLE_SUPERVISED_USERS) |
| 448 supervised_user_settings = | 448 supervised_user_settings = |
| 449 SupervisedUserSettingsServiceFactory::GetForProfile(this); | 449 SupervisedUserSettingsServiceFactory::GetForProfile(this); |
| 450 supervised_user_settings->Init( | 450 supervised_user_settings->Init( |
| 451 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); | 451 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); |
| 452 #endif | 452 #endif |
| 453 | 453 |
| 454 scoped_refptr<SafeBrowsingService> safe_browsing_service( | 454 scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service( |
| 455 g_browser_process->safe_browsing_service()); | 455 g_browser_process->safe_browsing_service()); |
| 456 if (safe_browsing_service.get()) { | 456 if (safe_browsing_service.get()) { |
| 457 pref_validation_delegate_ = | 457 pref_validation_delegate_ = |
| 458 safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass(); | 458 safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass(); |
| 459 } | 459 } |
| 460 | 460 |
| 461 { | 461 { |
| 462 prefs_ = chrome_prefs::CreateProfilePrefs( | 462 prefs_ = chrome_prefs::CreateProfilePrefs( |
| 463 path_, | 463 path_, |
| 464 sequenced_task_runner, | 464 sequenced_task_runner, |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1285 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1285 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1286 domain_reliability::DomainReliabilityService* service = | 1286 domain_reliability::DomainReliabilityService* service = |
| 1287 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1287 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1288 GetForBrowserContext(this); | 1288 GetForBrowserContext(this); |
| 1289 if (!service) | 1289 if (!service) |
| 1290 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1290 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1291 | 1291 |
| 1292 return service->CreateMonitor( | 1292 return service->CreateMonitor( |
| 1293 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1293 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 1294 } | 1294 } |
| OLD | NEW |