| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 128 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
| 129 #include "chrome/browser/chromeos/login/login_utils.h" | 129 #include "chrome/browser/chromeos/login/login_utils.h" |
| 130 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" | 130 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" |
| 131 #include "chrome/browser/chromeos/login/startup_utils.h" | 131 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 132 #include "chrome/browser/chromeos/login/user_image_manager.h" | 132 #include "chrome/browser/chromeos/login/user_image_manager.h" |
| 133 #include "chrome/browser/chromeos/login/user_manager.h" | 133 #include "chrome/browser/chromeos/login/user_manager.h" |
| 134 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 134 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 135 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 135 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 136 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 136 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 137 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 137 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 138 #include "chrome/browser/chromeos/power/power_prefs.h" |
| 138 #include "chrome/browser/chromeos/preferences.h" | 139 #include "chrome/browser/chromeos/preferences.h" |
| 139 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 140 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 140 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 141 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 141 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 142 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 142 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 143 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 143 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 144 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 144 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 145 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 145 #else | 146 #else |
| 146 #include "chrome/browser/extensions/default_apps.h" | 147 #include "chrome/browser/extensions/default_apps.h" |
| 147 #endif | 148 #endif |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 RegisterAutolaunchUserPrefs(registry); | 368 RegisterAutolaunchUserPrefs(registry); |
| 368 SyncPromoUI::RegisterUserPrefs(registry); | 369 SyncPromoUI::RegisterUserPrefs(registry); |
| 369 #endif | 370 #endif |
| 370 | 371 |
| 371 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 372 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 372 default_apps::RegisterUserPrefs(registry); | 373 default_apps::RegisterUserPrefs(registry); |
| 373 #endif | 374 #endif |
| 374 | 375 |
| 375 #if defined(OS_CHROMEOS) | 376 #if defined(OS_CHROMEOS) |
| 376 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); | 377 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); |
| 378 chromeos::PowerPrefs::RegisterUserPrefs(registry, for_signin_profile); |
| 377 chromeos::Preferences::RegisterUserPrefs(registry); | 379 chromeos::Preferences::RegisterUserPrefs(registry); |
| 378 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); | 380 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); |
| 379 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 381 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 380 RegisterUserPrefs(registry); | 382 RegisterUserPrefs(registry); |
| 381 FlagsUI::RegisterUserPrefs(registry); | 383 FlagsUI::RegisterUserPrefs(registry); |
| 382 #endif | 384 #endif |
| 383 | 385 |
| 384 #if defined(OS_WIN) | 386 #if defined(OS_WIN) |
| 385 NetworkProfileBubble::RegisterUserPrefs(registry); | 387 NetworkProfileBubble::RegisterUserPrefs(registry); |
| 386 #endif | 388 #endif |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 } | 471 } |
| 470 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 472 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 471 | 473 |
| 472 current_version |= GOOGLE_URL_TRACKER_PREFS; | 474 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 473 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 475 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 474 current_version); | 476 current_version); |
| 475 } | 477 } |
| 476 } | 478 } |
| 477 | 479 |
| 478 } // namespace chrome | 480 } // namespace chrome |
| OLD | NEW |