| 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/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 #include "chrome/browser/chromeos/customization_document.h" | 118 #include "chrome/browser/chromeos/customization_document.h" |
| 119 #include "chrome/browser/chromeos/display/display_preferences.h" | 119 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 120 #include "chrome/browser/chromeos/login/login_utils.h" | 120 #include "chrome/browser/chromeos/login/login_utils.h" |
| 121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" | 121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" |
| 122 #include "chrome/browser/chromeos/login/user_image_manager.h" | 122 #include "chrome/browser/chromeos/login/user_image_manager.h" |
| 123 #include "chrome/browser/chromeos/login/user_manager.h" | 123 #include "chrome/browser/chromeos/login/user_manager.h" |
| 124 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 124 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 125 #include "chrome/browser/chromeos/login/wizard_controller.h" | 125 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 126 #include "chrome/browser/chromeos/preferences.h" | 126 #include "chrome/browser/chromeos/preferences.h" |
| 127 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 127 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 128 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 128 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 129 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 129 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 130 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 130 #include "chrome/browser/policy/auto_enrollment_client.h" | 131 #include "chrome/browser/policy/auto_enrollment_client.h" |
| 131 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" | 132 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" |
| 132 #include "chrome/browser/policy/device_status_collector.h" | 133 #include "chrome/browser/policy/device_status_collector.h" |
| 133 #else | 134 #else |
| 134 #include "chrome/browser/extensions/default_apps.h" | 135 #include "chrome/browser/extensions/default_apps.h" |
| 135 #endif | 136 #endif |
| 136 | 137 |
| 137 #if defined(USE_ASH) | 138 #if defined(USE_ASH) |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 #if !defined(OS_ANDROID) | 230 #if !defined(OS_ANDROID) |
| 230 BackgroundModeManager::RegisterPrefs(registry); | 231 BackgroundModeManager::RegisterPrefs(registry); |
| 231 chrome_variations::VariationsService::RegisterPrefs(registry); | 232 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 232 RegisterBrowserPrefs(registry); | 233 RegisterBrowserPrefs(registry); |
| 233 ManagedMode::RegisterPrefs(registry); | 234 ManagedMode::RegisterPrefs(registry); |
| 234 #endif | 235 #endif |
| 235 | 236 |
| 236 #if defined(OS_CHROMEOS) | 237 #if defined(OS_CHROMEOS) |
| 237 chromeos::AudioHandler::RegisterPrefs(registry); | 238 chromeos::AudioHandler::RegisterPrefs(registry); |
| 238 chromeos::DataPromoNotification::RegisterPrefs(registry); | 239 chromeos::DataPromoNotification::RegisterPrefs(registry); |
| 240 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
| 239 chromeos::device_settings_cache::RegisterPrefs(registry); | 241 chromeos::device_settings_cache::RegisterPrefs(registry); |
| 240 chromeos::language_prefs::RegisterPrefs(registry); | 242 chromeos::language_prefs::RegisterPrefs(registry); |
| 241 chromeos::KioskAppManager::RegisterPrefs(registry); | 243 chromeos::KioskAppManager::RegisterPrefs(registry); |
| 242 chromeos::LoginUtils::RegisterPrefs(registry); | 244 chromeos::LoginUtils::RegisterPrefs(registry); |
| 243 chromeos::Preferences::RegisterPrefs(registry); | 245 chromeos::Preferences::RegisterPrefs(registry); |
| 244 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); | 246 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); |
| 245 chromeos::RegisterDisplayLocalStatePrefs(registry); | 247 chromeos::RegisterDisplayLocalStatePrefs(registry); |
| 246 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); | 248 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); |
| 247 chromeos::UserImageManager::RegisterPrefs(registry); | 249 chromeos::UserImageManager::RegisterPrefs(registry); |
| 248 chromeos::UserManager::RegisterPrefs(registry); | 250 chromeos::UserManager::RegisterPrefs(registry); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 } | 437 } |
| 436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 437 | 439 |
| 438 current_version |= GOOGLE_URL_TRACKER_PREFS; | 440 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 440 current_version); | 442 current_version); |
| 441 } | 443 } |
| 442 } | 444 } |
| 443 | 445 |
| 444 } // namespace chrome | 446 } // namespace chrome |
| OLD | NEW |