| 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 | 251 |
| 252 #if defined(OS_MACOSX) | 252 #if defined(OS_MACOSX) |
| 253 confirm_quit::RegisterLocalState(registry); | 253 confirm_quit::RegisterLocalState(registry); |
| 254 #endif | 254 #endif |
| 255 | 255 |
| 256 #if defined(ENABLE_SETTINGS_APP) | 256 #if defined(ENABLE_SETTINGS_APP) |
| 257 chrome::RegisterAppListPrefs(registry); | 257 chrome::RegisterAppListPrefs(registry); |
| 258 #endif | 258 #endif |
| 259 } | 259 } |
| 260 | 260 |
| 261 void RegisterUserPrefs(PrefService* user_prefs, | 261 void RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 262 PrefRegistrySyncable* registry) { | |
| 263 // TODO(joi): Get rid of the need for the PrefService parameter, and | |
| 264 // do registration prior to PrefService creation. | |
| 265 | |
| 266 // User prefs. Please keep this list alphabetized. | 262 // User prefs. Please keep this list alphabetized. |
| 267 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); | 263 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); |
| 268 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); | 264 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); |
| 269 AutofillManager::RegisterUserPrefs(registry); | 265 AutofillManager::RegisterUserPrefs(registry); |
| 270 BookmarkPromptPrefs::RegisterUserPrefs(registry); | 266 BookmarkPromptPrefs::RegisterUserPrefs(registry); |
| 271 bookmark_utils::RegisterUserPrefs(registry); | 267 bookmark_utils::RegisterUserPrefs(registry); |
| 272 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); | 268 BrowserInstantController::RegisterUserPrefs(registry); |
| 273 browser_sync::SyncPrefs::RegisterUserPrefs(registry); | 269 browser_sync::SyncPrefs::RegisterUserPrefs(registry); |
| 274 ChromeContentBrowserClient::RegisterUserPrefs(registry); | 270 ChromeContentBrowserClient::RegisterUserPrefs(registry); |
| 275 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 271 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
| 276 ChromeVersionService::RegisterUserPrefs(registry); | 272 ChromeVersionService::RegisterUserPrefs(registry); |
| 277 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 273 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
| 278 registry); | 274 registry); |
| 279 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 275 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
| 280 DownloadPrefs::RegisterUserPrefs(registry); | 276 DownloadPrefs::RegisterUserPrefs(registry); |
| 281 extensions::ComponentLoader::RegisterUserPrefs(registry); | 277 extensions::ComponentLoader::RegisterUserPrefs(registry); |
| 282 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 278 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 } | 435 } |
| 440 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 441 | 437 |
| 442 current_version |= GOOGLE_URL_TRACKER_PREFS; | 438 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 443 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 444 current_version); | 440 current_version); |
| 445 } | 441 } |
| 446 } | 442 } |
| 447 | 443 |
| 448 } // namespace chrome | 444 } // namespace chrome |
| OLD | NEW |