| 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 "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 bookmark_utils::RegisterProfilePrefs(registry); | 344 bookmark_utils::RegisterProfilePrefs(registry); |
| 345 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 345 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
| 346 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 346 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 347 ChromeVersionService::RegisterProfilePrefs(registry); | 347 ChromeVersionService::RegisterProfilePrefs(registry); |
| 348 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 348 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
| 349 registry); | 349 registry); |
| 350 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 350 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 351 chrome_prefs::RegisterProfilePrefs(registry); | 351 chrome_prefs::RegisterProfilePrefs(registry); |
| 352 DownloadPrefs::RegisterProfilePrefs(registry); | 352 DownloadPrefs::RegisterProfilePrefs(registry); |
| 353 easy_unlock::RegisterProfilePrefs(registry); | 353 easy_unlock::RegisterProfilePrefs(registry); |
| 354 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
| 354 HostContentSettingsMap::RegisterProfilePrefs(registry); | 355 HostContentSettingsMap::RegisterProfilePrefs(registry); |
| 355 IncognitoModePrefs::RegisterProfilePrefs(registry); | 356 IncognitoModePrefs::RegisterProfilePrefs(registry); |
| 356 InstantUI::RegisterProfilePrefs(registry); | 357 InstantUI::RegisterProfilePrefs(registry); |
| 357 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 358 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
| 358 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 359 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
| 359 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 360 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 360 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 361 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 361 NetPrefObserver::RegisterProfilePrefs(registry); | 362 NetPrefObserver::RegisterProfilePrefs(registry); |
| 362 | |
| 363 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 363 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
| 364 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 364 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 365 PrefsTabHelper::RegisterProfilePrefs(registry); | 365 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 366 Profile::RegisterProfilePrefs(registry); | 366 Profile::RegisterProfilePrefs(registry); |
| 367 ProfileImpl::RegisterProfilePrefs(registry); | 367 ProfileImpl::RegisterProfilePrefs(registry); |
| 368 PromoResourceService::RegisterProfilePrefs(registry); | 368 PromoResourceService::RegisterProfilePrefs(registry); |
| 369 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 369 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 370 RegisterBrowserUserPrefs(registry); | 370 RegisterBrowserUserPrefs(registry); |
| 371 SessionStartupPref::RegisterProfilePrefs(registry); | 371 SessionStartupPref::RegisterProfilePrefs(registry); |
| 372 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 372 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| 373 TranslatePrefs::RegisterProfilePrefs(registry); | 373 TranslatePrefs::RegisterProfilePrefs(registry); |
| 374 ZeroSuggestProvider::RegisterProfilePrefs(registry); | 374 ZeroSuggestProvider::RegisterProfilePrefs(registry); |
| 375 gcm::GCMProfileService::RegisterProfilePrefs(registry); | |
| 376 | 375 |
| 377 #if defined(ENABLE_AUTOFILL_DIALOG) | 376 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 378 autofill::AutofillDialogController::RegisterProfilePrefs(registry); | 377 autofill::AutofillDialogController::RegisterProfilePrefs(registry); |
| 379 #endif | 378 #endif |
| 380 | 379 |
| 381 #if defined(ENABLE_CONFIGURATION_POLICY) | 380 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 382 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 381 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
| 383 #endif | 382 #endif |
| 384 | 383 |
| 385 #if defined(ENABLE_EXTENSIONS) | 384 #if defined(ENABLE_EXTENSIONS) |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 #if defined(OS_CHROMEOS) | 590 #if defined(OS_CHROMEOS) |
| 592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 591 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 593 #endif | 592 #endif |
| 594 | 593 |
| 595 #if defined(TOOLKIT_VIEWS) | 594 #if defined(TOOLKIT_VIEWS) |
| 596 MigrateBrowserTabStripPrefs(local_state); | 595 MigrateBrowserTabStripPrefs(local_state); |
| 597 #endif | 596 #endif |
| 598 } | 597 } |
| 599 | 598 |
| 600 } // namespace chrome | 599 } // namespace chrome |
| OLD | NEW |