| 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 | 170 |
| 171 #if defined(OS_CHROMEOS) | 171 #if defined(OS_CHROMEOS) |
| 172 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 172 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 173 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 173 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 174 #include "chrome/browser/chromeos/customization/customization_document.h" | 174 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 175 #include "chrome/browser/chromeos/display/display_preferences.h" | 175 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 176 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 176 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
| 177 #include "chrome/browser/chromeos/file_system_provider/registry.h" | 177 #include "chrome/browser/chromeos/file_system_provider/registry.h" |
| 178 #include "chrome/browser/chromeos/first_run/first_run.h" | 178 #include "chrome/browser/chromeos/first_run/first_run.h" |
| 179 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" | 179 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
| 180 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" |
| 180 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 181 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
| 181 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 182 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 182 #include "chrome/browser/chromeos/login/startup_utils.h" | 183 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 183 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 184 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 184 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" | 185 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
| 185 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" | 186 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
| 186 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 187 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
| 187 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 188 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 188 #include "chrome/browser/chromeos/net/network_throttling_observer.h" | 189 #include "chrome/browser/chromeos/net/network_throttling_observer.h" |
| 189 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" | 190 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 | 595 |
| 595 #if defined(OS_CHROMEOS) | 596 #if defined(OS_CHROMEOS) |
| 596 arc::ArcAuthService::RegisterProfilePrefs(registry); | 597 arc::ArcAuthService::RegisterProfilePrefs(registry); |
| 597 chromeos::first_run::RegisterProfilePrefs(registry); | 598 chromeos::first_run::RegisterProfilePrefs(registry); |
| 598 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 599 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 599 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 600 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 600 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 601 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 601 chromeos::PinStorage::RegisterProfilePrefs(registry); | 602 chromeos::PinStorage::RegisterProfilePrefs(registry); |
| 602 chromeos::Preferences::RegisterProfilePrefs(registry); | 603 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 603 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); | 604 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); |
| 605 chromeos::RegisterQuickUnlockProfilePrefs(registry); |
| 604 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 606 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 605 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 607 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 606 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 608 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 607 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); | 609 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); |
| 608 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 610 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
| 609 ::onc::RegisterProfilePrefs(registry); | 611 ::onc::RegisterProfilePrefs(registry); |
| 610 #endif | 612 #endif |
| 611 | 613 |
| 612 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 614 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
| 613 ArcAppListPrefs::RegisterProfilePrefs(registry); | 615 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 // Added 8/2016. | 782 // Added 8/2016. |
| 781 profile_prefs->ClearPref(kStaticEncodings); | 783 profile_prefs->ClearPref(kStaticEncodings); |
| 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 784 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 783 | 785 |
| 784 // Added 9/2016. | 786 // Added 9/2016. |
| 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 787 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 788 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 787 } | 789 } |
| 788 | 790 |
| 789 } // namespace chrome | 791 } // namespace chrome |
| OLD | NEW |