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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 #include "chrome/browser/gpu/gpu_mode_manager.h" | 32 #include "chrome/browser/gpu/gpu_mode_manager.h" |
33 #include "chrome/browser/intranet_redirect_detector.h" | 33 #include "chrome/browser/intranet_redirect_detector.h" |
34 #include "chrome/browser/io_thread.h" | 34 #include "chrome/browser/io_thread.h" |
35 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 35 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
36 #include "chrome/browser/media/media_device_id_salt.h" | 36 #include "chrome/browser/media/media_device_id_salt.h" |
37 #include "chrome/browser/media/media_stream_devices_controller.h" | 37 #include "chrome/browser/media/media_stream_devices_controller.h" |
38 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 38 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
39 #include "chrome/browser/metrics/variations/variations_service.h" | 39 #include "chrome/browser/metrics/variations/variations_service.h" |
40 #include "chrome/browser/net/http_server_properties_manager.h" | 40 #include "chrome/browser/net/http_server_properties_manager.h" |
41 #include "chrome/browser/net/net_pref_observer.h" | 41 #include "chrome/browser/net/net_pref_observer.h" |
| 42 #include "chrome/browser/net/prediction_helper.h" |
42 #include "chrome/browser/net/predictor.h" | 43 #include "chrome/browser/net/predictor.h" |
43 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 44 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
44 #include "chrome/browser/net/ssl_config_service_manager.h" | 45 #include "chrome/browser/net/ssl_config_service_manager.h" |
45 #include "chrome/browser/notifications/desktop_notification_service.h" | 46 #include "chrome/browser/notifications/desktop_notification_service.h" |
46 #include "chrome/browser/notifications/message_center_notification_manager.h" | 47 #include "chrome/browser/notifications/message_center_notification_manager.h" |
47 #include "chrome/browser/pepper_flash_settings_manager.h" | 48 #include "chrome/browser/pepper_flash_settings_manager.h" |
48 #include "chrome/browser/plugins/plugin_finder.h" | 49 #include "chrome/browser/plugins/plugin_finder.h" |
49 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 50 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
50 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 51 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
51 #include "chrome/browser/prefs/pref_service_syncable.h" | 52 #include "chrome/browser/prefs/pref_service_syncable.h" |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); | 349 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); |
349 // User prefs. Please keep this list alphabetized. | 350 // User prefs. Please keep this list alphabetized. |
350 autofill::AutofillManager::RegisterProfilePrefs(registry); | 351 autofill::AutofillManager::RegisterProfilePrefs(registry); |
351 bookmark_utils::RegisterProfilePrefs(registry); | 352 bookmark_utils::RegisterProfilePrefs(registry); |
352 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 353 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
353 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 354 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
354 ChromeVersionService::RegisterProfilePrefs(registry); | 355 ChromeVersionService::RegisterProfilePrefs(registry); |
355 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 356 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
356 registry); | 357 registry); |
357 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 358 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 359 chrome_browser_net::RegisterPredictionHelperProfilePrefs(registry); |
358 chrome_prefs::RegisterProfilePrefs(registry); | 360 chrome_prefs::RegisterProfilePrefs(registry); |
359 DownloadPrefs::RegisterProfilePrefs(registry); | 361 DownloadPrefs::RegisterProfilePrefs(registry); |
360 easy_unlock::RegisterProfilePrefs(registry); | 362 easy_unlock::RegisterProfilePrefs(registry); |
361 gcm::GCMProfileService::RegisterProfilePrefs(registry); | 363 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
362 HostContentSettingsMap::RegisterProfilePrefs(registry); | 364 HostContentSettingsMap::RegisterProfilePrefs(registry); |
363 IncognitoModePrefs::RegisterProfilePrefs(registry); | 365 IncognitoModePrefs::RegisterProfilePrefs(registry); |
364 InstantUI::RegisterProfilePrefs(registry); | 366 InstantUI::RegisterProfilePrefs(registry); |
365 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 367 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
366 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 368 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
367 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 369 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 #if defined(OS_CHROMEOS) | 600 #if defined(OS_CHROMEOS) |
599 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 601 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
600 #endif | 602 #endif |
601 | 603 |
602 #if defined(TOOLKIT_VIEWS) | 604 #if defined(TOOLKIT_VIEWS) |
603 MigrateBrowserTabStripPrefs(local_state); | 605 MigrateBrowserTabStripPrefs(local_state); |
604 #endif | 606 #endif |
605 } | 607 } |
606 | 608 |
607 } // namespace chrome | 609 } // namespace chrome |
OLD | NEW |