| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 17 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/metrics/metrics_service.h" | 28 #include "chrome/browser/metrics/metrics_service.h" |
| 29 #include "chrome/browser/net/http_server_properties_manager.h" | 29 #include "chrome/browser/net/http_server_properties_manager.h" |
| 30 #include "chrome/browser/net/net_pref_observer.h" | 30 #include "chrome/browser/net/net_pref_observer.h" |
| 31 #include "chrome/browser/net/predictor.h" | 31 #include "chrome/browser/net/predictor.h" |
| 32 #include "chrome/browser/net/ssl_config_service_manager.h" | 32 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 33 #include "chrome/browser/notifications/desktop_notification_service.h" | 33 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 34 #include "chrome/browser/notifications/notification_ui_manager.h" | 34 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 35 #include "chrome/browser/page_info_model.h" | 35 #include "chrome/browser/page_info_model.h" |
| 36 #include "chrome/browser/password_manager/password_manager.h" | 36 #include "chrome/browser/password_manager/password_manager.h" |
| 37 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 37 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 38 #include "chrome/browser/policy/device_status_collector.h" |
| 38 #include "chrome/browser/policy/url_blacklist_manager.h" | 39 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 39 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 40 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 40 #include "chrome/browser/prefs/session_startup_pref.h" | 41 #include "chrome/browser/prefs/session_startup_pref.h" |
| 41 #include "chrome/browser/printing/print_job_manager.h" | 42 #include "chrome/browser/printing/print_job_manager.h" |
| 42 #include "chrome/browser/profiles/gaia_info_update_service.h" | 43 #include "chrome/browser/profiles/gaia_info_update_service.h" |
| 43 #include "chrome/browser/profiles/profile_impl.h" | 44 #include "chrome/browser/profiles/profile_impl.h" |
| 44 #include "chrome/browser/profiles/profile_info_cache.h" | 45 #include "chrome/browser/profiles/profile_info_cache.h" |
| 45 #include "chrome/browser/profiles/profile_manager.h" | 46 #include "chrome/browser/profiles/profile_manager.h" |
| 46 #include "chrome/browser/renderer_host/web_cache_manager.h" | 47 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 47 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 48 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 #endif | 123 #endif |
| 123 UpgradeDetector::RegisterPrefs(local_state); | 124 UpgradeDetector::RegisterPrefs(local_state); |
| 124 TaskManager::RegisterPrefs(local_state); | 125 TaskManager::RegisterPrefs(local_state); |
| 125 geolocation::RegisterPrefs(local_state); | 126 geolocation::RegisterPrefs(local_state); |
| 126 BackgroundModeManager::RegisterPrefs(local_state); | 127 BackgroundModeManager::RegisterPrefs(local_state); |
| 127 NotificationUIManager::RegisterPrefs(local_state); | 128 NotificationUIManager::RegisterPrefs(local_state); |
| 128 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 129 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
| 129 SSLConfigServiceManager::RegisterPrefs(local_state); | 130 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 130 #if defined(ENABLE_CONFIGURATION_POLICY) | 131 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 131 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 132 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 133 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 132 #endif | 134 #endif |
| 133 ProfileInfoCache::RegisterPrefs(local_state); | 135 ProfileInfoCache::RegisterPrefs(local_state); |
| 134 ProfileManager::RegisterPrefs(local_state); | 136 ProfileManager::RegisterPrefs(local_state); |
| 135 #if defined(OS_CHROMEOS) | 137 #if defined(OS_CHROMEOS) |
| 136 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); | 138 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); |
| 137 chromeos::UserManager::RegisterPrefs(local_state); | 139 chromeos::UserManager::RegisterPrefs(local_state); |
| 138 chromeos::WizardController::RegisterPrefs(local_state); | 140 chromeos::WizardController::RegisterPrefs(local_state); |
| 139 chromeos::InputMethodMenu::RegisterPrefs(local_state); | 141 chromeos::InputMethodMenu::RegisterPrefs(local_state); |
| 140 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 142 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 141 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 143 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 226 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 225 } | 227 } |
| 226 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 228 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 227 | 229 |
| 228 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 230 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 229 current_version | WINDOWS_PREFS); | 231 current_version | WINDOWS_PREFS); |
| 230 } | 232 } |
| 231 } | 233 } |
| 232 | 234 |
| 233 } // namespace browser | 235 } // namespace browser |
| OLD | NEW |