| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 UMA_HISTOGRAM_BOOLEAN("Settings.LegacyMachineIdGenerationSuccess", | 346 UMA_HISTOGRAM_BOOLEAN("Settings.LegacyMachineIdGenerationSuccess", |
| 347 !legacy_device_id.empty()); | 347 !legacy_device_id.empty()); |
| 348 #endif | 348 #endif |
| 349 std::string seed; | 349 std::string seed; |
| 350 #if defined(GOOGLE_CHROME_BUILD) | 350 #if defined(GOOGLE_CHROME_BUILD) |
| 351 seed = ResourceBundle::GetSharedInstance().GetRawDataResource( | 351 seed = ResourceBundle::GetSharedInstance().GetRawDataResource( |
| 352 IDR_PREF_HASH_SEED_BIN).as_string(); | 352 IDR_PREF_HASH_SEED_BIN).as_string(); |
| 353 #endif | 353 #endif |
| 354 return base::MakeUnique<ProfilePrefStoreManager>( | 354 return base::MakeUnique<ProfilePrefStoreManager>( |
| 355 profile_path, GetTrackingConfiguration(), kTrackedPrefsReportingIDsCount, | 355 profile_path, GetTrackingConfiguration(), kTrackedPrefsReportingIDsCount, |
| 356 seed, legacy_device_id, g_browser_process->local_state()); | 356 seed, legacy_device_id); |
| 357 } | 357 } |
| 358 | 358 |
| 359 void PrepareFactory(sync_preferences::PrefServiceSyncableFactory* factory, | 359 void PrepareFactory(sync_preferences::PrefServiceSyncableFactory* factory, |
| 360 const base::FilePath& pref_filename, | 360 const base::FilePath& pref_filename, |
| 361 policy::PolicyService* policy_service, | 361 policy::PolicyService* policy_service, |
| 362 SupervisedUserSettingsService* supervised_user_settings, | 362 SupervisedUserSettingsService* supervised_user_settings, |
| 363 scoped_refptr<PersistentPrefStore> user_pref_store, | 363 scoped_refptr<PersistentPrefStore> user_pref_store, |
| 364 const scoped_refptr<PrefStore>& extension_prefs, | 364 const scoped_refptr<PrefStore>& extension_prefs, |
| 365 bool async) { | 365 bool async) { |
| 366 policy::BrowserPolicyConnector* policy_connector = | 366 policy::BrowserPolicyConnector* policy_connector = |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 | 478 |
| 479 void ClearResetTime(Profile* profile) { | 479 void ClearResetTime(Profile* profile) { |
| 480 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); | 480 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); |
| 481 } | 481 } |
| 482 | 482 |
| 483 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 483 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 484 ProfilePrefStoreManager::RegisterProfilePrefs(registry); | 484 ProfilePrefStoreManager::RegisterProfilePrefs(registry); |
| 485 } | 485 } |
| 486 | 486 |
| 487 } // namespace chrome_prefs | 487 } // namespace chrome_prefs |
| OLD | NEW |