| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 namespace browser { | 106 namespace browser { |
| 107 | 107 |
| 108 void RegisterLocalState(PrefService* local_state) { | 108 void RegisterLocalState(PrefService* local_state) { |
| 109 // Prefs in Local State | 109 // Prefs in Local State |
| 110 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 110 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 111 | 111 |
| 112 AppsPromo::RegisterPrefs(local_state); | 112 AppsPromo::RegisterPrefs(local_state); |
| 113 Browser::RegisterPrefs(local_state); | 113 Browser::RegisterPrefs(local_state); |
| 114 browser_shutdown::RegisterPrefs(local_state); | 114 browser_shutdown::RegisterPrefs(local_state); |
| 115 ExternalProtocolHandler::RegisterPrefs(local_state); | 115 ExternalProtocolHandler::RegisterPrefs(local_state); |
| 116 FlagsUI::RegisterPrefs(local_state); | |
| 117 geolocation::RegisterPrefs(local_state); | 116 geolocation::RegisterPrefs(local_state); |
| 118 GoogleURLTracker::RegisterPrefs(local_state); | 117 GoogleURLTracker::RegisterPrefs(local_state); |
| 119 IntranetRedirectDetector::RegisterPrefs(local_state); | 118 IntranetRedirectDetector::RegisterPrefs(local_state); |
| 120 KeywordEditorController::RegisterPrefs(local_state); | 119 KeywordEditorController::RegisterPrefs(local_state); |
| 121 ManagedMode::RegisterPrefs(local_state); | 120 ManagedMode::RegisterPrefs(local_state); |
| 122 MetricsLog::RegisterPrefs(local_state); | 121 MetricsLog::RegisterPrefs(local_state); |
| 123 MetricsService::RegisterPrefs(local_state); | 122 MetricsService::RegisterPrefs(local_state); |
| 124 NotificationUIManager::RegisterPrefs(local_state); | 123 NotificationUIManager::RegisterPrefs(local_state); |
| 125 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 124 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
| 126 ProfileInfoCache::RegisterPrefs(local_state); | 125 ProfileInfoCache::RegisterPrefs(local_state); |
| 127 ProfileManager::RegisterPrefs(local_state); | 126 ProfileManager::RegisterPrefs(local_state); |
| 128 SSLConfigServiceManager::RegisterPrefs(local_state); | 127 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 129 TaskManager::RegisterPrefs(local_state); | 128 TaskManager::RegisterPrefs(local_state); |
| 130 WebCacheManager::RegisterPrefs(local_state); | 129 WebCacheManager::RegisterPrefs(local_state); |
| 131 | 130 |
| 132 #if defined(ENABLE_CONFIGURATION_POLICY) | 131 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 133 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 132 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 134 #endif | 133 #endif |
| 135 | 134 |
| 136 #if defined(ENABLE_SAFE_BROWSING) | 135 #if defined(ENABLE_SAFE_BROWSING) |
| 137 SafeBrowsingService::RegisterPrefs(local_state); | 136 SafeBrowsingService::RegisterPrefs(local_state); |
| 138 #endif | 137 #endif |
| 139 | 138 |
| 140 #if defined(TOOLKIT_VIEWS) | 139 #if defined(TOOLKIT_VIEWS) |
| 141 BrowserView::RegisterBrowserViewPrefs(local_state); | 140 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 142 #endif | 141 #endif |
| 143 | 142 |
| 144 #if !defined(OS_ANDROID) | 143 #if !defined(OS_ANDROID) |
| 145 BackgroundModeManager::RegisterPrefs(local_state); | 144 BackgroundModeManager::RegisterPrefs(local_state); |
| 145 FlagsUI::RegisterPrefs(local_state); |
| 146 NewTabPageHandler::RegisterPrefs(local_state); | 146 NewTabPageHandler::RegisterPrefs(local_state); |
| 147 printing::PrintJobManager::RegisterPrefs(local_state); | 147 printing::PrintJobManager::RegisterPrefs(local_state); |
| 148 PromoResourceService::RegisterPrefs(local_state); | 148 PromoResourceService::RegisterPrefs(local_state); |
| 149 UpgradeDetector::RegisterPrefs(local_state); | 149 UpgradeDetector::RegisterPrefs(local_state); |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if defined(OS_CHROMEOS) | 152 #if defined(OS_CHROMEOS) |
| 153 chromeos::AudioHandler::RegisterPrefs(local_state); | 153 chromeos::AudioHandler::RegisterPrefs(local_state); |
| 154 chromeos::language_prefs::RegisterPrefs(local_state); | 154 chromeos::language_prefs::RegisterPrefs(local_state); |
| 155 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 155 chromeos::NetworkMenuButton::RegisterPrefs(local_state); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 } | 280 } |
| 281 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 281 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 282 | 282 |
| 283 current_version |= WINDOWS_PREFS; | 283 current_version |= WINDOWS_PREFS; |
| 284 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 284 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 285 current_version); | 285 current_version); |
| 286 } | 286 } |
| 287 } | 287 } |
| 288 | 288 |
| 289 } // namespace browser | 289 } // namespace browser |
| OLD | NEW |