| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 132 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 #if defined(OS_CHROMEOS) | 135 #if defined(OS_CHROMEOS) |
| 136 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 136 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 137 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" | 137 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
| 138 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 138 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
| 139 #include "chrome/browser/chromeos/customization_document.h" | 139 #include "chrome/browser/chromeos/customization_document.h" |
| 140 #include "chrome/browser/chromeos/display/display_preferences.h" | 140 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 141 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 141 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
| 142 #include "chrome/browser/chromeos/extensions/speech_synthesis_loader.h" |
| 142 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 143 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
| 143 #include "chrome/browser/chromeos/login/login_utils.h" | 144 #include "chrome/browser/chromeos/login/login_utils.h" |
| 144 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h" | 145 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h" |
| 145 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" | 146 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" |
| 146 #include "chrome/browser/chromeos/login/startup_utils.h" | 147 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 147 #include "chrome/browser/chromeos/login/user_image_manager.h" | 148 #include "chrome/browser/chromeos/login/user_image_manager.h" |
| 148 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" | 149 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" |
| 149 #include "chrome/browser/chromeos/login/user_manager.h" | 150 #include "chrome/browser/chromeos/login/user_manager.h" |
| 150 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 151 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 151 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 152 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 default_apps::RegisterProfilePrefs(registry); | 417 default_apps::RegisterProfilePrefs(registry); |
| 417 #endif | 418 #endif |
| 418 | 419 |
| 419 #if defined(OS_CHROMEOS) | 420 #if defined(OS_CHROMEOS) |
| 420 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( | 421 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( |
| 421 registry); | 422 registry); |
| 422 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); | 423 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); |
| 423 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 424 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 424 chromeos::Preferences::RegisterProfilePrefs(registry); | 425 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 425 chromeos::proxy_config::RegisterProfilePrefs(registry); | 426 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 427 chromeos::SpeechSynthesisLoader::RegisterProfilePrefs(registry); |
| 426 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 428 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 427 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 429 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 428 RegisterProfilePrefs(registry); | 430 RegisterProfilePrefs(registry); |
| 429 FlagsUI::RegisterProfilePrefs(registry); | 431 FlagsUI::RegisterProfilePrefs(registry); |
| 430 #endif | 432 #endif |
| 431 | 433 |
| 432 #if defined(OS_MACOSX) | 434 #if defined(OS_MACOSX) |
| 433 RegisterBrowserActionsControllerProfilePrefs(registry); | 435 RegisterBrowserActionsControllerProfilePrefs(registry); |
| 434 #endif | 436 #endif |
| 435 | 437 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 562 } |
| 561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 563 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 562 | 564 |
| 563 current_version |= GOOGLE_URL_TRACKER_PREFS; | 565 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 565 current_version); | 567 current_version); |
| 566 } | 568 } |
| 567 } | 569 } |
| 568 | 570 |
| 569 } // namespace chrome | 571 } // namespace chrome |
| OLD | NEW |