| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 641844a72279bd3a6b232a6593f10ec0d7db93ff..9e6ba82791d604de179e0dc0ad8c9fb582a8e3b8 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -212,6 +212,7 @@
|
| #include "chromeos/audio/audio_devices_pref_handler_impl.h"
|
| #include "chromeos/timezone/timezone_resolver.h"
|
| #include "components/invalidation/impl/invalidator_storage.h"
|
| +#include "components/onc/onc_pref_names.h"
|
| #include "components/quirks/quirks_manager.h"
|
| #else
|
| #include "chrome/browser/extensions/default_apps.h"
|
| @@ -418,7 +419,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
|
| chromeos::DemoModeDetector::RegisterPrefs(registry);
|
| chromeos::Preferences::RegisterPrefs(registry);
|
| - chromeos::proxy_config::RegisterPrefs(registry);
|
| chromeos::RegisterDisplayLocalStatePrefs(registry);
|
| chromeos::ResetScreenHandler::RegisterPrefs(registry);
|
| chromeos::ResourceReporter::RegisterPrefs(registry);
|
| @@ -434,6 +434,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| chromeos::echo_offer::RegisterPrefs(registry);
|
| extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
|
| invalidation::InvalidatorStorage::RegisterPrefs(registry);
|
| + ::onc::RegisterPrefs(registry);
|
| policy::AutoEnrollmentClient::RegisterPrefs(registry);
|
| policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
|
| policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
|
| @@ -599,12 +600,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| chromeos::PinStorage::RegisterProfilePrefs(registry);
|
| chromeos::Preferences::RegisterProfilePrefs(registry);
|
| chromeos::PrinterPrefManager::RegisterProfilePrefs(registry);
|
| - chromeos::proxy_config::RegisterProfilePrefs(registry);
|
| chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
|
| chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
|
| chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
|
| extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
|
| flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
|
| + ::onc::RegisterProfilePrefs(registry);
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
|
|
|