| 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/prefs/chrome_pref_service_factory.h" | 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 policy_service, | 520 policy_service, |
| 521 supervised_user_settings, | 521 supervised_user_settings, |
| 522 user_pref_store, | 522 user_pref_store, |
| 523 extension_prefs, | 523 extension_prefs, |
| 524 async); | 524 async); |
| 525 scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service = | 525 scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service = |
| 526 factory.CreateSyncable(pref_registry.get()); | 526 factory.CreateSyncable(pref_registry.get()); |
| 527 | 527 |
| 528 ConfigureDefaultSearchPrefMigrationToDictionaryValue(pref_service.get()); | 528 ConfigureDefaultSearchPrefMigrationToDictionaryValue(pref_service.get()); |
| 529 | 529 |
| 530 return pref_service.Pass(); | 530 return pref_service; |
| 531 } | 531 } |
| 532 | 532 |
| 533 void DisableDomainCheckForTesting() { | 533 void DisableDomainCheckForTesting() { |
| 534 #if defined(OS_WIN) | 534 #if defined(OS_WIN) |
| 535 g_disable_domain_check_for_testing = true; | 535 g_disable_domain_check_for_testing = true; |
| 536 #endif // OS_WIN | 536 #endif // OS_WIN |
| 537 } | 537 } |
| 538 | 538 |
| 539 bool InitializePrefsFromMasterPrefs( | 539 bool InitializePrefsFromMasterPrefs( |
| 540 const base::FilePath& profile_path, | 540 const base::FilePath& profile_path, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 553 | 553 |
| 554 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 554 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 555 ProfilePrefStoreManager::RegisterProfilePrefs(registry); | 555 ProfilePrefStoreManager::RegisterProfilePrefs(registry); |
| 556 } | 556 } |
| 557 | 557 |
| 558 void RegisterPrefs(PrefRegistrySimple* registry) { | 558 void RegisterPrefs(PrefRegistrySimple* registry) { |
| 559 ProfilePrefStoreManager::RegisterPrefs(registry); | 559 ProfilePrefStoreManager::RegisterPrefs(registry); |
| 560 } | 560 } |
| 561 | 561 |
| 562 } // namespace chrome_prefs | 562 } // namespace chrome_prefs |
| OLD | NEW |