| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 #include "chrome/browser/chromeos/preferences.h" | 179 #include "chrome/browser/chromeos/preferences.h" |
| 180 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 180 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 181 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 181 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 182 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 182 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 183 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 183 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 184 #include "chrome/browser/chromeos/system/input_device_settings.h" | 184 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 187 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 187 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| 189 #include "chrome/browser/ui/app_list/arc_app_list_prefs.h" |
| 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" | 190 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
| 190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" | 191 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" |
| 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" | 192 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
| 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 193 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 194 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 194 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 195 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 195 #include "chromeos/timezone/timezone_resolver.h" | 196 #include "chromeos/timezone/timezone_resolver.h" |
| 196 #include "components/invalidation/impl/invalidator_storage.h" | 197 #include "components/invalidation/impl/invalidator_storage.h" |
| 197 #else | 198 #else |
| 198 #include "chrome/browser/extensions/default_apps.h" | 199 #include "chrome/browser/extensions/default_apps.h" |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 485 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 485 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 486 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 486 chromeos::Preferences::RegisterProfilePrefs(registry); | 487 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 487 chromeos::proxy_config::RegisterProfilePrefs(registry); | 488 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 488 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 489 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 489 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 490 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 490 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 491 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 491 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 492 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 492 RegisterProfilePrefs(registry); | 493 RegisterProfilePrefs(registry); |
| 493 FlagsUI::RegisterProfilePrefs(registry); | 494 FlagsUI::RegisterProfilePrefs(registry); |
| 495 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 494 #endif | 496 #endif |
| 495 | 497 |
| 496 #if defined(OS_WIN) | 498 #if defined(OS_WIN) |
| 497 component_updater::RegisterProfilePrefsForSwReporter(registry); | 499 component_updater::RegisterProfilePrefsForSwReporter(registry); |
| 498 NetworkProfileBubble::RegisterProfilePrefs(registry); | 500 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 499 #endif | 501 #endif |
| 500 | 502 |
| 501 #if defined(TOOLKIT_VIEWS) | 503 #if defined(TOOLKIT_VIEWS) |
| 502 RegisterBrowserViewProfilePrefs(registry); | 504 RegisterBrowserViewProfilePrefs(registry); |
| 503 RegisterInvertBubbleUserPrefs(registry); | 505 RegisterInvertBubbleUserPrefs(registry); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 MigrateGoogleNowPrefs(profile); | 562 MigrateGoogleNowPrefs(profile); |
| 561 #endif | 563 #endif |
| 562 | 564 |
| 563 #if defined(OS_WIN) | 565 #if defined(OS_WIN) |
| 564 // Added 11/2015. | 566 // Added 11/2015. |
| 565 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); | 567 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); |
| 566 #endif | 568 #endif |
| 567 } | 569 } |
| 568 | 570 |
| 569 } // namespace chrome | 571 } // namespace chrome |
| OLD | NEW |