| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 chromeos::WizardController::RegisterPrefs(registry); | 248 chromeos::WizardController::RegisterPrefs(registry); |
| 249 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 249 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
| 250 policy::DeviceStatusCollector::RegisterPrefs(registry); | 250 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 251 #endif | 251 #endif |
| 252 | 252 |
| 253 #if defined(OS_MACOSX) | 253 #if defined(OS_MACOSX) |
| 254 confirm_quit::RegisterLocalState(registry); | 254 confirm_quit::RegisterLocalState(registry); |
| 255 #endif | 255 #endif |
| 256 } | 256 } |
| 257 | 257 |
| 258 void RegisterUserPrefs(PrefService* user_prefs, | 258 void RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 259 PrefRegistrySyncable* registry) { | |
| 260 // TODO(joi): Get rid of the need for the PrefService parameter, and | |
| 261 // do registration prior to PrefService creation. | |
| 262 | |
| 263 // User prefs. Please keep this list alphabetized. | 259 // User prefs. Please keep this list alphabetized. |
| 264 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); | 260 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); |
| 265 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); | 261 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); |
| 266 AutofillManager::RegisterUserPrefs(registry); | 262 AutofillManager::RegisterUserPrefs(registry); |
| 267 BookmarkPromptPrefs::RegisterUserPrefs(registry); | 263 BookmarkPromptPrefs::RegisterUserPrefs(registry); |
| 268 bookmark_utils::RegisterUserPrefs(registry); | 264 bookmark_utils::RegisterUserPrefs(registry); |
| 269 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); | 265 BrowserInstantController::RegisterUserPrefs(registry); |
| 270 browser_sync::SyncPrefs::RegisterUserPrefs(registry); | 266 browser_sync::SyncPrefs::RegisterUserPrefs(registry); |
| 271 ChromeContentBrowserClient::RegisterUserPrefs(registry); | 267 ChromeContentBrowserClient::RegisterUserPrefs(registry); |
| 272 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 268 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
| 273 ChromeVersionService::RegisterUserPrefs(registry); | 269 ChromeVersionService::RegisterUserPrefs(registry); |
| 274 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 270 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
| 275 registry); | 271 registry); |
| 276 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 272 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
| 277 DownloadPrefs::RegisterUserPrefs(registry); | 273 DownloadPrefs::RegisterUserPrefs(registry); |
| 278 extensions::ComponentLoader::RegisterUserPrefs(registry); | 274 extensions::ComponentLoader::RegisterUserPrefs(registry); |
| 279 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 275 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 } | 432 } |
| 437 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 433 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 438 | 434 |
| 439 current_version |= GOOGLE_URL_TRACKER_PREFS; | 435 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 440 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 436 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 441 current_version); | 437 current_version); |
| 442 } | 438 } |
| 443 } | 439 } |
| 444 | 440 |
| 445 } // namespace chrome | 441 } // namespace chrome |
| OLD | NEW |