| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 #if defined(TOOLKIT_GTK) | 86 #if defined(TOOLKIT_GTK) |
| 87 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 87 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 88 #endif | 88 #endif |
| 89 | 89 |
| 90 #if defined(OS_CHROMEOS) | 90 #if defined(OS_CHROMEOS) |
| 91 #include "chrome/browser/chromeos/audio/audio_handler.h" | 91 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 92 #include "chrome/browser/chromeos/customization_document.h" | 92 #include "chrome/browser/chromeos/customization_document.h" |
| 93 #include "chrome/browser/chromeos/login/signed_settings_cache.h" | 93 #include "chrome/browser/chromeos/login/signed_settings_cache.h" |
| 94 #include "chrome/browser/chromeos/login/user_manager.h" | 94 #include "chrome/browser/chromeos/login/user_manager.h" |
| 95 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 95 #include "chrome/browser/chromeos/login/wizard_controller.h" | 96 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 96 #include "chrome/browser/chromeos/preferences.h" | 97 #include "chrome/browser/chromeos/preferences.h" |
| 97 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 98 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 98 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 99 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 99 #include "chrome/browser/policy/auto_enrollment_client.h" | 100 #include "chrome/browser/policy/auto_enrollment_client.h" |
| 100 #include "chrome/browser/policy/device_status_collector.h" | 101 #include "chrome/browser/policy/device_status_collector.h" |
| 101 #else | 102 #else |
| 102 #include "chrome/browser/extensions/default_apps.h" | 103 #include "chrome/browser/extensions/default_apps.h" |
| 103 #endif | 104 #endif |
| 104 | 105 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 #endif | 171 #endif |
| 171 | 172 |
| 172 #if defined(OS_CHROMEOS) | 173 #if defined(OS_CHROMEOS) |
| 173 chromeos::AudioHandler::RegisterPrefs(local_state); | 174 chromeos::AudioHandler::RegisterPrefs(local_state); |
| 174 chromeos::language_prefs::RegisterPrefs(local_state); | 175 chromeos::language_prefs::RegisterPrefs(local_state); |
| 175 chromeos::DataPromoNotification::RegisterPrefs(local_state); | 176 chromeos::DataPromoNotification::RegisterPrefs(local_state); |
| 176 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 177 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
| 177 chromeos::UserManager::RegisterPrefs(local_state); | 178 chromeos::UserManager::RegisterPrefs(local_state); |
| 178 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 179 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 179 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 180 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| 181 chromeos::WallpaperManager::RegisterPrefs(local_state); |
| 180 chromeos::WizardController::RegisterPrefs(local_state); | 182 chromeos::WizardController::RegisterPrefs(local_state); |
| 181 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 183 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| 182 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 184 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 183 #endif | 185 #endif |
| 184 | 186 |
| 185 #if defined(OS_MACOSX) | 187 #if defined(OS_MACOSX) |
| 186 RegisterObsoleteOSInfobarPrefs(local_state); | 188 RegisterObsoleteOSInfobarPrefs(local_state); |
| 187 confirm_quit::RegisterLocalState(local_state); | 189 confirm_quit::RegisterLocalState(local_state); |
| 188 #endif | 190 #endif |
| 189 } | 191 } |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 } | 328 } |
| 327 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 329 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 328 | 330 |
| 329 current_version |= GOOGLE_URL_TRACKER_PREFS; | 331 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 330 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 332 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 331 current_version); | 333 current_version); |
| 332 } | 334 } |
| 333 } | 335 } |
| 334 | 336 |
| 335 } // namespace chrome | 337 } // namespace chrome |
| OLD | NEW |