| 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); | 422 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); |
| 423 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 423 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 424 PinnedTabCodec::RegisterProfilePrefs(registry); | 424 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 425 PluginsUI::RegisterProfilePrefs(registry); | 425 PluginsUI::RegisterProfilePrefs(registry); |
| 426 RegisterAutolaunchUserPrefs(registry); | 426 RegisterAutolaunchUserPrefs(registry); |
| 427 signin::RegisterProfilePrefs(registry); | 427 signin::RegisterProfilePrefs(registry); |
| 428 #endif | 428 #endif |
| 429 | 429 |
| 430 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 430 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 431 default_apps::RegisterProfilePrefs(registry); | 431 default_apps::RegisterProfilePrefs(registry); |
| 432 profiles::RegisterTutorialPrefs(registry); |
| 432 #endif | 433 #endif |
| 433 | 434 |
| 434 #if defined(OS_CHROMEOS) | 435 #if defined(OS_CHROMEOS) |
| 435 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( | 436 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( |
| 436 registry); | 437 registry); |
| 437 chromeos::first_run::RegisterProfilePrefs(registry); | 438 chromeos::first_run::RegisterProfilePrefs(registry); |
| 438 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); | 439 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); |
| 439 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 440 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 440 chromeos::Preferences::RegisterProfilePrefs(registry); | 441 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 441 chromeos::proxy_config::RegisterProfilePrefs(registry); | 442 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 471 registry->RegisterDictionaryPref( | 472 registry->RegisterDictionaryPref( |
| 472 kBackupPref, | 473 kBackupPref, |
| 473 new base::DictionaryValue(), | 474 new base::DictionaryValue(), |
| 474 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 475 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 475 #if !defined(OS_ANDROID) | 476 #if !defined(OS_ANDROID) |
| 476 registry->RegisterStringPref( | 477 registry->RegisterStringPref( |
| 477 kSyncPromoErrorMessage, | 478 kSyncPromoErrorMessage, |
| 478 std::string(), | 479 std::string(), |
| 479 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 480 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 480 #endif | 481 #endif |
| 481 | |
| 482 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | |
| 483 RegisterNewProfileUIPrefs(registry); | |
| 484 #endif | |
| 485 } | 482 } |
| 486 | 483 |
| 487 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 484 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 488 RegisterProfilePrefs(registry); | 485 RegisterProfilePrefs(registry); |
| 489 | 486 |
| 490 #if defined(OS_CHROMEOS) | 487 #if defined(OS_CHROMEOS) |
| 491 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); | 488 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); |
| 492 #endif | 489 #endif |
| 493 } | 490 } |
| 494 | 491 |
| 495 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) { | 492 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) { |
| 496 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false); | 493 registry->RegisterBooleanPref(prefs::kDisableScreenshots, false); |
| 497 } | 494 } |
| 498 | 495 |
| 499 #if defined(OS_CHROMEOS) | 496 #if defined(OS_CHROMEOS) |
| 500 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 497 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 501 RegisterProfilePrefs(registry); | 498 RegisterProfilePrefs(registry); |
| 502 | 499 |
| 503 chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry); | 500 chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry); |
| 504 } | 501 } |
| 505 #endif | 502 #endif |
| 506 | 503 |
| 507 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | |
| 508 void RegisterNewProfileUIPrefs(user_prefs::PrefRegistrySyncable* registry) { | |
| 509 registry->RegisterIntegerPref( | |
| 510 prefs::kProfileAvatarTutorialShown, | |
| 511 0, | |
| 512 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 513 } | |
| 514 #endif | |
| 515 | |
| 516 void MigrateUserPrefs(Profile* profile) { | 504 void MigrateUserPrefs(Profile* profile) { |
| 517 PrefService* prefs = profile->GetPrefs(); | 505 PrefService* prefs = profile->GetPrefs(); |
| 518 | 506 |
| 519 // Cleanup prefs from now-removed protector feature. | 507 // Cleanup prefs from now-removed protector feature. |
| 520 prefs->ClearPref(kBackupPref); | 508 prefs->ClearPref(kBackupPref); |
| 521 | 509 |
| 522 #if !defined(OS_ANDROID) | 510 #if !defined(OS_ANDROID) |
| 523 // Cleanup now-removed sync promo error message preference. | 511 // Cleanup now-removed sync promo error message preference. |
| 524 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442). | 512 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442). |
| 525 prefs->ClearPref(kSyncPromoErrorMessage); | 513 prefs->ClearPref(kSyncPromoErrorMessage); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 580 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 593 current_version); | 581 current_version); |
| 594 } | 582 } |
| 595 | 583 |
| 596 #if defined(OS_CHROMEOS) | 584 #if defined(OS_CHROMEOS) |
| 597 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 585 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 598 #endif | 586 #endif |
| 599 } | 587 } |
| 600 | 588 |
| 601 } // namespace chrome | 589 } // namespace chrome |
| OLD | NEW |