| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 chromeos::DemoModeDetector::RegisterPrefs(registry); | 422 chromeos::DemoModeDetector::RegisterPrefs(registry); |
| 423 chromeos::NetworkThrottlingObserver::RegisterPrefs(registry); | 423 chromeos::NetworkThrottlingObserver::RegisterPrefs(registry); |
| 424 chromeos::Preferences::RegisterPrefs(registry); | 424 chromeos::Preferences::RegisterPrefs(registry); |
| 425 chromeos::RegisterDisplayLocalStatePrefs(registry); | 425 chromeos::RegisterDisplayLocalStatePrefs(registry); |
| 426 chromeos::ResetScreenHandler::RegisterPrefs(registry); | 426 chromeos::ResetScreenHandler::RegisterPrefs(registry); |
| 427 chromeos::ResourceReporter::RegisterPrefs(registry); | 427 chromeos::ResourceReporter::RegisterPrefs(registry); |
| 428 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); | 428 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); |
| 429 chromeos::SigninScreenHandler::RegisterPrefs(registry); | 429 chromeos::SigninScreenHandler::RegisterPrefs(registry); |
| 430 chromeos::StartupUtils::RegisterPrefs(registry); | 430 chromeos::StartupUtils::RegisterPrefs(registry); |
| 431 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); | 431 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); |
| 432 chromeos::system::InputDeviceSettings::RegisterPrefs(registry); |
| 432 chromeos::TimeZoneResolver::RegisterPrefs(registry); | 433 chromeos::TimeZoneResolver::RegisterPrefs(registry); |
| 433 chromeos::UserImageManager::RegisterPrefs(registry); | 434 chromeos::UserImageManager::RegisterPrefs(registry); |
| 434 chromeos::UserSessionManager::RegisterPrefs(registry); | 435 chromeos::UserSessionManager::RegisterPrefs(registry); |
| 435 chromeos::WallpaperManager::RegisterPrefs(registry); | 436 chromeos::WallpaperManager::RegisterPrefs(registry); |
| 436 chromeos::echo_offer::RegisterPrefs(registry); | 437 chromeos::echo_offer::RegisterPrefs(registry); |
| 437 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); | 438 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); |
| 438 invalidation::InvalidatorStorage::RegisterPrefs(registry); | 439 invalidation::InvalidatorStorage::RegisterPrefs(registry); |
| 439 ::onc::RegisterPrefs(registry); | 440 ::onc::RegisterPrefs(registry); |
| 440 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 441 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
| 441 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); | 442 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 RegisterProfilePrefs(registry); | 701 RegisterProfilePrefs(registry); |
| 701 | 702 |
| 702 chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry); | 703 chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry); |
| 703 } | 704 } |
| 704 #endif | 705 #endif |
| 705 | 706 |
| 706 // This method should be periodically pruned of year+ old migrations. | 707 // This method should be periodically pruned of year+ old migrations. |
| 707 void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) { | 708 void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) { |
| 708 #if defined(OS_CHROMEOS) | 709 #if defined(OS_CHROMEOS) |
| 709 // Added 11/2016 | 710 // Added 11/2016 |
| 710 local_state->ClearPref(prefs::kTouchScreenEnabled); | 711 local_state->ClearPref(prefs::kTouchscreenEnabled); |
| 711 local_state->ClearPref(prefs::kTouchPadEnabled); | 712 local_state->ClearPref(prefs::kTouchpadEnabled); |
| 712 #endif // defined(OS_CHROMEOS) | 713 #endif // defined(OS_CHROMEOS) |
| 713 } | 714 } |
| 714 | 715 |
| 715 // This method should be periodically pruned of year+ old migrations. | 716 // This method should be periodically pruned of year+ old migrations. |
| 716 void MigrateObsoleteProfilePrefs(Profile* profile) { | 717 void MigrateObsoleteProfilePrefs(Profile* profile) { |
| 717 PrefService* profile_prefs = profile->GetPrefs(); | 718 PrefService* profile_prefs = profile->GetPrefs(); |
| 718 | 719 |
| 719 #if defined(OS_MACOSX) | 720 #if defined(OS_MACOSX) |
| 720 // Migrate the value of kHideFullscreenToolbar to kShowFullscreenToolbar if | 721 // Migrate the value of kHideFullscreenToolbar to kShowFullscreenToolbar if |
| 721 // it was set by the user. See crbug.com/590827. | 722 // it was set by the user. See crbug.com/590827. |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 // Added 8/2016. | 784 // Added 8/2016. |
| 784 profile_prefs->ClearPref(kStaticEncodings); | 785 profile_prefs->ClearPref(kStaticEncodings); |
| 785 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 786 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 786 | 787 |
| 787 // Added 9/2016. | 788 // Added 9/2016. |
| 788 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 789 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 789 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 790 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 790 } | 791 } |
| 791 | 792 |
| 792 } // namespace chrome | 793 } // namespace chrome |
| OLD | NEW |