| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 browser::RegisterBrowserViewPrefs(local_state); | 144 browser::RegisterBrowserViewPrefs(local_state); |
| 145 browser::RegisterTabStripLayoutTypePrefs(local_state); | 145 browser::RegisterTabStripLayoutTypePrefs(local_state); |
| 146 #endif | 146 #endif |
| 147 | 147 |
| 148 #if !defined(OS_ANDROID) | 148 #if !defined(OS_ANDROID) |
| 149 BackgroundModeManager::RegisterPrefs(local_state); | 149 BackgroundModeManager::RegisterPrefs(local_state); |
| 150 Browser::RegisterPrefs(local_state); | 150 Browser::RegisterPrefs(local_state); |
| 151 FlagsUI::RegisterPrefs(local_state); | 151 FlagsUI::RegisterPrefs(local_state); |
| 152 ManagedMode::RegisterPrefs(local_state); | 152 ManagedMode::RegisterPrefs(local_state); |
| 153 NewTabPageHandler::RegisterPrefs(local_state); | 153 NewTabPageHandler::RegisterPrefs(local_state); |
| 154 printing::PrintJobManager::RegisterPrefs(local_state); | |
| 155 PromoResourceService::RegisterPrefs(local_state); | 154 PromoResourceService::RegisterPrefs(local_state); |
| 156 UpgradeDetector::RegisterPrefs(local_state); | 155 UpgradeDetector::RegisterPrefs(local_state); |
| 157 #endif | 156 #endif |
| 158 | 157 |
| 158 #if defined(ENABLE_PRINTING) |
| 159 printing::PrintJobManager::RegisterPrefs(local_state); |
| 160 #endif |
| 161 |
| 159 #if defined(OS_CHROMEOS) | 162 #if defined(OS_CHROMEOS) |
| 160 chromeos::AudioHandler::RegisterPrefs(local_state); | 163 chromeos::AudioHandler::RegisterPrefs(local_state); |
| 161 chromeos::language_prefs::RegisterPrefs(local_state); | 164 chromeos::language_prefs::RegisterPrefs(local_state); |
| 162 chromeos::DataPromoNotification::RegisterPrefs(local_state); | 165 chromeos::DataPromoNotification::RegisterPrefs(local_state); |
| 163 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 166 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
| 164 chromeos::UserManager::RegisterPrefs(local_state); | 167 chromeos::UserManager::RegisterPrefs(local_state); |
| 165 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 168 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 166 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 169 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| 167 chromeos::WizardController::RegisterPrefs(local_state); | 170 chromeos::WizardController::RegisterPrefs(local_state); |
| 168 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 171 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 } | 313 } |
| 311 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 314 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 312 | 315 |
| 313 current_version |= GOOGLE_URL_TRACKER_PREFS; | 316 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 314 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 317 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 315 current_version); | 318 current_version); |
| 316 } | 319 } |
| 317 } | 320 } |
| 318 | 321 |
| 319 } // namespace browser | 322 } // namespace browser |
| OLD | NEW |