| 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 175 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
| 176 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" | 176 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" |
| 177 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 177 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 178 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 178 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 179 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | 179 #include "chrome/browser/chromeos/policy/consumer_management_service.h" |
| 180 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 180 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 181 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 181 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 182 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 182 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
| 183 #include "chrome/browser/chromeos/power/power_prefs.h" | 183 #include "chrome/browser/chromeos/power/power_prefs.h" |
| 184 #include "chrome/browser/chromeos/preferences.h" | 184 #include "chrome/browser/chromeos/preferences.h" |
| 185 #include "chrome/browser/chromeos/printing/printer_pref_manager.h" |
| 185 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 186 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 186 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 187 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 187 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 188 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 188 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 189 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 189 #include "chrome/browser/chromeos/system/input_device_settings.h" | 190 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 190 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 191 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 191 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 192 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 192 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 193 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| 193 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 194 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| 194 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" | 195 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 #endif | 561 #endif |
| 561 | 562 |
| 562 #if defined(OS_CHROMEOS) | 563 #if defined(OS_CHROMEOS) |
| 563 arc::ArcAuthService::RegisterProfilePrefs(registry); | 564 arc::ArcAuthService::RegisterProfilePrefs(registry); |
| 564 chromeos::first_run::RegisterProfilePrefs(registry); | 565 chromeos::first_run::RegisterProfilePrefs(registry); |
| 565 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 566 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 566 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 567 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 567 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 568 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 568 chromeos::PinStorage::RegisterProfilePrefs(registry); | 569 chromeos::PinStorage::RegisterProfilePrefs(registry); |
| 569 chromeos::Preferences::RegisterProfilePrefs(registry); | 570 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 571 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); |
| 570 chromeos::proxy_config::RegisterProfilePrefs(registry); | 572 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 571 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 573 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 572 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 574 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 573 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 575 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 574 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); | 576 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); |
| 575 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 577 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
| 576 #endif | 578 #endif |
| 577 | 579 |
| 578 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 580 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 579 ArcAppListPrefs::RegisterProfilePrefs(registry); | 581 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 profile_prefs->ClearPref(kCheckDefaultBrowser); | 728 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 727 | 729 |
| 728 // Added 5/2016. | 730 // Added 5/2016. |
| 729 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 731 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 730 | 732 |
| 731 // Added 7/2016. | 733 // Added 7/2016. |
| 732 DeleteWebRTCIdentityStoreDB(profile); | 734 DeleteWebRTCIdentityStoreDB(profile); |
| 733 } | 735 } |
| 734 | 736 |
| 735 } // namespace chrome | 737 } // namespace chrome |
| OLD | NEW |