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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" | 138 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
139 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 139 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
140 #include "chrome/browser/chromeos/customization_document.h" | 140 #include "chrome/browser/chromeos/customization_document.h" |
141 #include "chrome/browser/chromeos/display/display_preferences.h" | 141 #include "chrome/browser/chromeos/display/display_preferences.h" |
142 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 142 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
143 #include "chrome/browser/chromeos/first_run/first_run.h" | 143 #include "chrome/browser/chromeos/first_run/first_run.h" |
144 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 144 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
145 #include "chrome/browser/chromeos/login/login_utils.h" | 145 #include "chrome/browser/chromeos/login/login_utils.h" |
146 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h" | 146 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h" |
147 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" | 147 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" |
| 148 #include "chrome/browser/chromeos/login/saml_offline_signin_limiter.h" |
148 #include "chrome/browser/chromeos/login/startup_utils.h" | 149 #include "chrome/browser/chromeos/login/startup_utils.h" |
149 #include "chrome/browser/chromeos/login/user_image_manager.h" | 150 #include "chrome/browser/chromeos/login/user_image_manager.h" |
150 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" | 151 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" |
151 #include "chrome/browser/chromeos/login/user_manager.h" | 152 #include "chrome/browser/chromeos/login/user_manager.h" |
152 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 153 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
153 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 154 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
154 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 155 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
155 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 156 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
156 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 157 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
157 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 158 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 #endif | 428 #endif |
428 | 429 |
429 #if defined(OS_CHROMEOS) | 430 #if defined(OS_CHROMEOS) |
430 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( | 431 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( |
431 registry); | 432 registry); |
432 chromeos::first_run::RegisterProfilePrefs(registry); | 433 chromeos::first_run::RegisterProfilePrefs(registry); |
433 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); | 434 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); |
434 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 435 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
435 chromeos::Preferences::RegisterProfilePrefs(registry); | 436 chromeos::Preferences::RegisterProfilePrefs(registry); |
436 chromeos::proxy_config::RegisterProfilePrefs(registry); | 437 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 438 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
437 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 439 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
438 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 440 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
439 RegisterProfilePrefs(registry); | 441 RegisterProfilePrefs(registry); |
440 FlagsUI::RegisterProfilePrefs(registry); | 442 FlagsUI::RegisterProfilePrefs(registry); |
441 #endif | 443 #endif |
442 | 444 |
443 #if defined(OS_MACOSX) | 445 #if defined(OS_MACOSX) |
444 RegisterBrowserActionsControllerProfilePrefs(registry); | 446 RegisterBrowserActionsControllerProfilePrefs(registry); |
445 #endif | 447 #endif |
446 | 448 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
572 current_version); | 574 current_version); |
573 } | 575 } |
574 | 576 |
575 #if defined(OS_CHROMEOS) | 577 #if defined(OS_CHROMEOS) |
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
577 #endif | 579 #endif |
578 } | 580 } |
579 | 581 |
580 } // namespace chrome | 582 } // namespace chrome |
OLD | NEW |