| 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 new JsonPrefStore(pref_filename, pref_io_task_runner, | 491 new JsonPrefStore(pref_filename, pref_io_task_runner, |
| 492 std::unique_ptr<PrefFilter>()), | 492 std::unique_ptr<PrefFilter>()), |
| 493 NULL, // extension_prefs | 493 NULL, // extension_prefs |
| 494 async); | 494 async); |
| 495 return factory.Create(pref_registry.get()); | 495 return factory.Create(pref_registry.get()); |
| 496 } | 496 } |
| 497 | 497 |
| 498 std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs( | 498 std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs( |
| 499 const base::FilePath& profile_path, | 499 const base::FilePath& profile_path, |
| 500 base::SequencedTaskRunner* pref_io_task_runner, | 500 base::SequencedTaskRunner* pref_io_task_runner, |
| 501 TrackedPreferenceValidationDelegate* validation_delegate, | 501 prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate, |
| 502 policy::PolicyService* policy_service, | 502 policy::PolicyService* policy_service, |
| 503 SupervisedUserSettingsService* supervised_user_settings, | 503 SupervisedUserSettingsService* supervised_user_settings, |
| 504 const scoped_refptr<PrefStore>& extension_prefs, | 504 const scoped_refptr<PrefStore>& extension_prefs, |
| 505 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, | 505 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, |
| 506 bool async) { | 506 bool async) { |
| 507 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); | 507 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); |
| 508 SCOPED_UMA_HISTOGRAM_TIMER("PrefService.CreateProfilePrefsTime"); | 508 SCOPED_UMA_HISTOGRAM_TIMER("PrefService.CreateProfilePrefsTime"); |
| 509 | 509 |
| 510 // A StartSyncFlare used to kick sync early in case of a reset event. This is | 510 // A StartSyncFlare used to kick sync early in case of a reset event. This is |
| 511 // done since sync may bring back the user's server value post-reset which | 511 // 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... |
| 551 | 551 |
| 552 void ClearResetTime(Profile* profile) { | 552 void ClearResetTime(Profile* profile) { |
| 553 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); | 553 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); |
| 554 } | 554 } |
| 555 | 555 |
| 556 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 556 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 557 ProfilePrefStoreManager::RegisterProfilePrefs(registry); | 557 ProfilePrefStoreManager::RegisterProfilePrefs(registry); |
| 558 } | 558 } |
| 559 | 559 |
| 560 } // namespace chrome_prefs | 560 } // namespace chrome_prefs |
| OLD | NEW |