| 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_command_line_pref_store.h> | 5 #include <chrome/browser/prefs/chrome_command_line_pref_store.h> |
| 6 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 6 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 new JsonPrefStore(pref_filename, pref_io_task_runner, | 465 new JsonPrefStore(pref_filename, pref_io_task_runner, |
| 466 std::unique_ptr<PrefFilter>()), | 466 std::unique_ptr<PrefFilter>()), |
| 467 NULL, // extension_prefs | 467 NULL, // extension_prefs |
| 468 async); | 468 async); |
| 469 return factory.Create(pref_registry.get()); | 469 return factory.Create(pref_registry.get()); |
| 470 } | 470 } |
| 471 | 471 |
| 472 std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs( | 472 std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs( |
| 473 const base::FilePath& profile_path, | 473 const base::FilePath& profile_path, |
| 474 base::SequencedTaskRunner* pref_io_task_runner, | 474 base::SequencedTaskRunner* pref_io_task_runner, |
| 475 TrackedPreferenceValidationDelegate* validation_delegate, | 475 prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate, |
| 476 policy::PolicyService* policy_service, | 476 policy::PolicyService* policy_service, |
| 477 SupervisedUserSettingsService* supervised_user_settings, | 477 SupervisedUserSettingsService* supervised_user_settings, |
| 478 const scoped_refptr<PrefStore>& extension_prefs, | 478 const scoped_refptr<PrefStore>& extension_prefs, |
| 479 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, | 479 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, |
| 480 bool async) { | 480 bool async) { |
| 481 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); | 481 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); |
| 482 SCOPED_UMA_HISTOGRAM_TIMER("PrefService.CreateProfilePrefsTime"); | 482 SCOPED_UMA_HISTOGRAM_TIMER("PrefService.CreateProfilePrefsTime"); |
| 483 | 483 |
| 484 // A StartSyncFlare used to kick sync early in case of a reset event. This is | 484 // A StartSyncFlare used to kick sync early in case of a reset event. This is |
| 485 // done since sync may bring back the user's server value post-reset which | 485 // done since sync may bring back the user's server value post-reset which |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 | 525 |
| 526 void ClearResetTime(Profile* profile) { | 526 void ClearResetTime(Profile* profile) { |
| 527 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); | 527 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); |
| 528 } | 528 } |
| 529 | 529 |
| 530 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 530 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 531 ProfilePrefStoreManager::RegisterProfilePrefs(registry); | 531 ProfilePrefStoreManager::RegisterProfilePrefs(registry); |
| 532 } | 532 } |
| 533 | 533 |
| 534 } // namespace chrome_prefs | 534 } // namespace chrome_prefs |
| OLD | NEW |