| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
| 6 | 6 |
| 7 #include "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 #endif | 452 #endif |
| 453 | 453 |
| 454 #if defined(USE_ASH) | 454 #if defined(USE_ASH) |
| 455 ash::RegisterChromeLauncherUserPrefs(registry); | 455 ash::RegisterChromeLauncherUserPrefs(registry); |
| 456 #endif | 456 #endif |
| 457 | 457 |
| 458 // Prefs registered only for migration (clearing or moving to a new | 458 // Prefs registered only for migration (clearing or moving to a new |
| 459 // key) go here. | 459 // key) go here. |
| 460 registry->RegisterDictionaryPref( | 460 registry->RegisterDictionaryPref( |
| 461 kBackupPref, | 461 kBackupPref, |
| 462 new DictionaryValue(), | 462 new base::DictionaryValue(), |
| 463 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 463 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 464 #if !defined(OS_ANDROID) | 464 #if !defined(OS_ANDROID) |
| 465 registry->RegisterStringPref( | 465 registry->RegisterStringPref( |
| 466 kSyncPromoErrorMessage, | 466 kSyncPromoErrorMessage, |
| 467 std::string(), | 467 std::string(), |
| 468 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 468 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 469 #endif | 469 #endif |
| 470 } | 470 } |
| 471 | 471 |
| 472 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 472 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 565 current_version); | 565 current_version); |
| 566 } | 566 } |
| 567 | 567 |
| 568 #if defined(OS_CHROMEOS) | 568 #if defined(OS_CHROMEOS) |
| 569 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 569 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 570 #endif | 570 #endif |
| 571 } | 571 } |
| 572 | 572 |
| 573 } // namespace chrome | 573 } // namespace chrome |
| OLD | NEW |