| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 void RegisterUserPrefs(PrefService* user_prefs, | 259 void RegisterUserPrefs(PrefService* user_prefs, |
| 260 PrefRegistrySyncable* registry) { | 260 PrefRegistrySyncable* registry) { |
| 261 // TODO(joi): Get rid of the need for the PrefService parameter, and | 261 // TODO(joi): Get rid of the need for the PrefService parameter, and |
| 262 // do registration prior to PrefService creation. | 262 // do registration prior to PrefService creation. |
| 263 | 263 |
| 264 // User prefs. Please keep this list alphabetized. | 264 // User prefs. Please keep this list alphabetized. |
| 265 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); | 265 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); |
| 266 AutofillManager::RegisterUserPrefs(registry); | 266 AutofillManager::RegisterUserPrefs(registry); |
| 267 BookmarkPromptPrefs::RegisterUserPrefs(registry); | 267 BookmarkPromptPrefs::RegisterUserPrefs(registry); |
| 268 bookmark_utils::RegisterUserPrefs(registry); | 268 bookmark_utils::RegisterUserPrefs(registry); |
| 269 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); | 269 BrowserInstantController::RegisterUserPrefs(registry); |
| 270 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry); | 270 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry); |
| 271 ChromeContentBrowserClient::RegisterUserPrefs(registry); | 271 ChromeContentBrowserClient::RegisterUserPrefs(registry); |
| 272 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 272 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
| 273 ChromeVersionService::RegisterUserPrefs(registry); | 273 ChromeVersionService::RegisterUserPrefs(registry); |
| 274 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 274 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
| 275 registry); | 275 registry); |
| 276 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 276 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
| 277 DownloadPrefs::RegisterUserPrefs(registry); | 277 DownloadPrefs::RegisterUserPrefs(registry); |
| 278 extensions::ComponentLoader::RegisterUserPrefs(registry); | 278 extensions::ComponentLoader::RegisterUserPrefs(registry); |
| 279 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 279 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 } | 433 } |
| 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 435 | 435 |
| 436 current_version |= GOOGLE_URL_TRACKER_PREFS; | 436 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 438 current_version); | 438 current_version); |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 } // namespace chrome | 442 } // namespace chrome |
| OLD | NEW |