| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include "chrome/browser/ui/webui/flags_ui.h" | 76 #include "chrome/browser/ui/webui/flags_ui.h" |
| 77 #include "chrome/browser/ui/webui/instant_ui.h" | 77 #include "chrome/browser/ui/webui/instant_ui.h" |
| 78 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 78 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 79 #include "chrome/browser/ui/webui/plugins_ui.h" | 79 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 80 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 80 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 81 #include "chrome/browser/upgrade_detector.h" | 81 #include "chrome/browser/upgrade_detector.h" |
| 82 #include "chrome/browser/web_resource/promo_resource_service.h" | 82 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 83 #include "chrome/common/pref_names.h" | 83 #include "chrome/common/pref_names.h" |
| 84 #include "components/autofill/core/browser/autofill_manager.h" | 84 #include "components/autofill/core/browser/autofill_manager.h" |
| 85 #include "components/bookmarks/browser/bookmark_utils.h" | 85 #include "components/bookmarks/browser/bookmark_utils.h" |
| 86 #include "components/dom_distiller/core/reader_mode_preferences.h" |
| 86 #include "components/google/core/browser/google_pref_names.h" | 87 #include "components/google/core/browser/google_pref_names.h" |
| 87 #include "components/google/core/browser/google_url_tracker.h" | 88 #include "components/google/core/browser/google_url_tracker.h" |
| 88 #include "components/network_time/network_time_tracker.h" | 89 #include "components/network_time/network_time_tracker.h" |
| 89 #include "components/password_manager/core/browser/password_manager.h" | 90 #include "components/password_manager/core/browser/password_manager.h" |
| 90 #include "components/pref_registry/pref_registry_syncable.h" | 91 #include "components/pref_registry/pref_registry_syncable.h" |
| 91 #include "components/rappor/rappor_service.h" | 92 #include "components/rappor/rappor_service.h" |
| 92 #include "components/sync_driver/sync_prefs.h" | 93 #include "components/sync_driver/sync_prefs.h" |
| 93 #include "components/translate/core/browser/translate_prefs.h" | 94 #include "components/translate/core/browser/translate_prefs.h" |
| 94 #include "content/public/browser/render_process_host.h" | 95 #include "content/public/browser/render_process_host.h" |
| 95 #include "extensions/browser/extension_prefs.h" | 96 #include "extensions/browser/extension_prefs.h" |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 // User prefs. Please keep this list alphabetized. | 344 // User prefs. Please keep this list alphabetized. |
| 344 autofill::AutofillManager::RegisterProfilePrefs(registry); | 345 autofill::AutofillManager::RegisterProfilePrefs(registry); |
| 345 bookmark_utils::RegisterProfilePrefs(registry); | 346 bookmark_utils::RegisterProfilePrefs(registry); |
| 346 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 347 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
| 347 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 348 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 348 ChromeVersionService::RegisterProfilePrefs(registry); | 349 ChromeVersionService::RegisterProfilePrefs(registry); |
| 349 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 350 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
| 350 registry); | 351 registry); |
| 351 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 352 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 352 chrome_prefs::RegisterProfilePrefs(registry); | 353 chrome_prefs::RegisterProfilePrefs(registry); |
| 354 dom_distiller::ReaderModePrefs::RegisterProfilePrefs(registry); |
| 353 DownloadPrefs::RegisterProfilePrefs(registry); | 355 DownloadPrefs::RegisterProfilePrefs(registry); |
| 354 easy_unlock::RegisterProfilePrefs(registry); | 356 easy_unlock::RegisterProfilePrefs(registry); |
| 355 gcm::GCMProfileService::RegisterProfilePrefs(registry); | 357 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
| 356 HostContentSettingsMap::RegisterProfilePrefs(registry); | 358 HostContentSettingsMap::RegisterProfilePrefs(registry); |
| 357 IncognitoModePrefs::RegisterProfilePrefs(registry); | 359 IncognitoModePrefs::RegisterProfilePrefs(registry); |
| 358 InstantUI::RegisterProfilePrefs(registry); | 360 InstantUI::RegisterProfilePrefs(registry); |
| 359 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 361 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
| 360 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 362 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
| 361 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 363 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 362 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 364 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 #if defined(OS_CHROMEOS) | 594 #if defined(OS_CHROMEOS) |
| 593 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 595 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 594 #endif | 596 #endif |
| 595 | 597 |
| 596 #if defined(TOOLKIT_VIEWS) | 598 #if defined(TOOLKIT_VIEWS) |
| 597 MigrateBrowserTabStripPrefs(local_state); | 599 MigrateBrowserTabStripPrefs(local_state); |
| 598 #endif | 600 #endif |
| 599 } | 601 } |
| 600 | 602 |
| 601 } // namespace chrome | 603 } // namespace chrome |
| OLD | NEW |