| 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/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
| 9 #include "chrome/browser/background/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 #endif | 83 #endif |
| 84 | 84 |
| 85 #if defined(OS_CHROMEOS) | 85 #if defined(OS_CHROMEOS) |
| 86 #include "chrome/browser/chromeos/audio/audio_handler.h" | 86 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 87 #include "chrome/browser/chromeos/customization_document.h" | 87 #include "chrome/browser/chromeos/customization_document.h" |
| 88 #include "chrome/browser/chromeos/login/signed_settings_cache.h" | 88 #include "chrome/browser/chromeos/login/signed_settings_cache.h" |
| 89 #include "chrome/browser/chromeos/login/user_manager.h" | 89 #include "chrome/browser/chromeos/login/user_manager.h" |
| 90 #include "chrome/browser/chromeos/login/wizard_controller.h" | 90 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 91 #include "chrome/browser/chromeos/preferences.h" | 91 #include "chrome/browser/chromeos/preferences.h" |
| 92 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 92 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 93 #include "chrome/browser/chromeos/status/input_method_menu.h" | 93 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 94 #include "chrome/browser/chromeos/status/network_menu_button.h" | |
| 95 #include "chrome/browser/policy/auto_enrollment_client.h" | 94 #include "chrome/browser/policy/auto_enrollment_client.h" |
| 96 #include "chrome/browser/policy/device_status_collector.h" | 95 #include "chrome/browser/policy/device_status_collector.h" |
| 97 #else | 96 #else |
| 98 #include "chrome/browser/extensions/default_apps.h" | 97 #include "chrome/browser/extensions/default_apps.h" |
| 99 #endif | 98 #endif |
| 100 | 99 |
| 101 #if defined(USE_ASH) | 100 #if defined(USE_ASH) |
| 102 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" | 101 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" |
| 103 #endif | 102 #endif |
| 104 | 103 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 ManagedMode::RegisterPrefs(local_state); | 149 ManagedMode::RegisterPrefs(local_state); |
| 151 NewTabPageHandler::RegisterPrefs(local_state); | 150 NewTabPageHandler::RegisterPrefs(local_state); |
| 152 printing::PrintJobManager::RegisterPrefs(local_state); | 151 printing::PrintJobManager::RegisterPrefs(local_state); |
| 153 PromoResourceService::RegisterPrefs(local_state); | 152 PromoResourceService::RegisterPrefs(local_state); |
| 154 UpgradeDetector::RegisterPrefs(local_state); | 153 UpgradeDetector::RegisterPrefs(local_state); |
| 155 #endif | 154 #endif |
| 156 | 155 |
| 157 #if defined(OS_CHROMEOS) | 156 #if defined(OS_CHROMEOS) |
| 158 chromeos::AudioHandler::RegisterPrefs(local_state); | 157 chromeos::AudioHandler::RegisterPrefs(local_state); |
| 159 chromeos::language_prefs::RegisterPrefs(local_state); | 158 chromeos::language_prefs::RegisterPrefs(local_state); |
| 160 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 159 chromeos::DataPromoNotification::RegisterPrefs(local_state); |
| 161 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 160 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
| 162 chromeos::UserManager::RegisterPrefs(local_state); | 161 chromeos::UserManager::RegisterPrefs(local_state); |
| 163 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 162 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 164 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 163 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| 165 chromeos::WizardController::RegisterPrefs(local_state); | 164 chromeos::WizardController::RegisterPrefs(local_state); |
| 166 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 165 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| 167 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 166 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 168 #endif | 167 #endif |
| 169 | 168 |
| 170 #if defined(OS_MACOSX) | 169 #if defined(OS_MACOSX) |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 } | 282 } |
| 284 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 283 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 285 | 284 |
| 286 current_version |= WINDOWS_PREFS; | 285 current_version |= WINDOWS_PREFS; |
| 287 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 286 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 288 current_version); | 287 current_version); |
| 289 } | 288 } |
| 290 } | 289 } |
| 291 | 290 |
| 292 } // namespace browser | 291 } // namespace browser |
| OLD | NEW |