| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 156 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 157 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 157 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
| 158 #include "chrome/browser/chromeos/power/power_prefs.h" | 158 #include "chrome/browser/chromeos/power/power_prefs.h" |
| 159 #include "chrome/browser/chromeos/preferences.h" | 159 #include "chrome/browser/chromeos/preferences.h" |
| 160 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 160 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 161 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 161 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 162 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 162 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 163 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 163 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 164 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 164 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 165 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | 165 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" |
| 166 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" |
| 166 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 167 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 167 #else | 168 #else |
| 168 #include "chrome/browser/extensions/default_apps.h" | 169 #include "chrome/browser/extensions/default_apps.h" |
| 169 #endif | 170 #endif |
| 170 | 171 |
| 171 #if defined(OS_MACOSX) | 172 #if defined(OS_MACOSX) |
| 172 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 173 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 173 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 174 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
| 174 #endif | 175 #endif |
| 175 | 176 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); | 287 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |
| 287 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); | 288 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); |
| 288 chromeos::DataPromoNotification::RegisterPrefs(registry); | 289 chromeos::DataPromoNotification::RegisterPrefs(registry); |
| 289 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); | 290 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
| 290 chromeos::device_settings_cache::RegisterPrefs(registry); | 291 chromeos::device_settings_cache::RegisterPrefs(registry); |
| 291 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); | 292 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); |
| 292 chromeos::language_prefs::RegisterPrefs(registry); | 293 chromeos::language_prefs::RegisterPrefs(registry); |
| 293 chromeos::KioskAppManager::RegisterPrefs(registry); | 294 chromeos::KioskAppManager::RegisterPrefs(registry); |
| 294 chromeos::LoginUtils::RegisterPrefs(registry); | 295 chromeos::LoginUtils::RegisterPrefs(registry); |
| 295 chromeos::MultiProfileUserController::RegisterPrefs(registry); | 296 chromeos::MultiProfileUserController::RegisterPrefs(registry); |
| 297 chromeos::NetworkScreenHandler::RegisterPrefs(registry); |
| 296 chromeos::Preferences::RegisterPrefs(registry); | 298 chromeos::Preferences::RegisterPrefs(registry); |
| 297 chromeos::proxy_config::RegisterPrefs(registry); | 299 chromeos::proxy_config::RegisterPrefs(registry); |
| 298 chromeos::RegisterDisplayLocalStatePrefs(registry); | 300 chromeos::RegisterDisplayLocalStatePrefs(registry); |
| 299 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); | 301 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); |
| 300 chromeos::SigninScreenHandler::RegisterPrefs(registry); | 302 chromeos::SigninScreenHandler::RegisterPrefs(registry); |
| 301 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); | 303 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); |
| 302 chromeos::UserImageManager::RegisterPrefs(registry); | 304 chromeos::UserImageManager::RegisterPrefs(registry); |
| 303 chromeos::UserManager::RegisterPrefs(registry); | 305 chromeos::UserManager::RegisterPrefs(registry); |
| 304 chromeos::WallpaperManager::RegisterPrefs(registry); | 306 chromeos::WallpaperManager::RegisterPrefs(registry); |
| 305 chromeos::StartupUtils::RegisterPrefs(registry); | 307 chromeos::StartupUtils::RegisterPrefs(registry); |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 570 current_version); | 572 current_version); |
| 571 } | 573 } |
| 572 | 574 |
| 573 #if defined(OS_CHROMEOS) | 575 #if defined(OS_CHROMEOS) |
| 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 575 #endif | 577 #endif |
| 576 } | 578 } |
| 577 | 579 |
| 578 } // namespace chrome | 580 } // namespace chrome |
| OLD | NEW |