| 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 #include "chrome/browser/android/preferences/browser_prefs_android.h" | 165 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
| 166 #else | 166 #else |
| 167 #include "chrome/browser/services/gcm/gcm_product_util.h" | 167 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| 168 #include "chrome/browser/signin/signin_promo.h" | 168 #include "chrome/browser/signin/signin_promo.h" |
| 169 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 169 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 170 #endif | 170 #endif |
| 171 | 171 |
| 172 #if defined(OS_CHROMEOS) | 172 #if defined(OS_CHROMEOS) |
| 173 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" | 173 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" |
| 174 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 174 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 175 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 175 #include "chrome/browser/chromeos/arc/arc_session_manager.h" |
| 176 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" | 176 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" |
| 177 #include "chrome/browser/chromeos/customization/customization_document.h" | 177 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 178 #include "chrome/browser/chromeos/display/display_preferences.h" | 178 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 179 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 179 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
| 180 #include "chrome/browser/chromeos/file_system_provider/registry.h" | 180 #include "chrome/browser/chromeos/file_system_provider/registry.h" |
| 181 #include "chrome/browser/chromeos/first_run/first_run.h" | 181 #include "chrome/browser/chromeos/first_run/first_run.h" |
| 182 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" | 182 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
| 183 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" | 183 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" |
| 184 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 184 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
| 185 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 185 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 588 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 589 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 589 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 590 gcm::RegisterProfilePrefs(registry); | 590 gcm::RegisterProfilePrefs(registry); |
| 591 #endif | 591 #endif |
| 592 | 592 |
| 593 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 593 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 594 default_apps::RegisterProfilePrefs(registry); | 594 default_apps::RegisterProfilePrefs(registry); |
| 595 #endif | 595 #endif |
| 596 | 596 |
| 597 #if defined(OS_CHROMEOS) | 597 #if defined(OS_CHROMEOS) |
| 598 arc::ArcAuthService::RegisterProfilePrefs(registry); | 598 arc::ArcSessionManager::RegisterProfilePrefs(registry); |
| 599 arc::ArcPolicyBridge::RegisterProfilePrefs(registry); | 599 arc::ArcPolicyBridge::RegisterProfilePrefs(registry); |
| 600 chromeos::first_run::RegisterProfilePrefs(registry); | 600 chromeos::first_run::RegisterProfilePrefs(registry); |
| 601 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 601 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 602 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 602 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 603 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 603 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 604 chromeos::PinStorage::RegisterProfilePrefs(registry); | 604 chromeos::PinStorage::RegisterProfilePrefs(registry); |
| 605 chromeos::Preferences::RegisterProfilePrefs(registry); | 605 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 606 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); | 606 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); |
| 607 chromeos::RegisterQuickUnlockProfilePrefs(registry); | 607 chromeos::RegisterQuickUnlockProfilePrefs(registry); |
| 608 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 608 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 // Added 8/2016. | 781 // Added 8/2016. |
| 782 profile_prefs->ClearPref(kStaticEncodings); | 782 profile_prefs->ClearPref(kStaticEncodings); |
| 783 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 783 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 784 | 784 |
| 785 // Added 9/2016. | 785 // Added 9/2016. |
| 786 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 786 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 787 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 787 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 788 } | 788 } |
| 789 | 789 |
| 790 } // namespace chrome | 790 } // namespace chrome |
| OLD | NEW |