| 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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "chrome/browser/geolocation/geolocation_prefs.h" | 31 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 32 #include "chrome/browser/google/google_url_tracker.h" | 32 #include "chrome/browser/google/google_url_tracker.h" |
| 33 #include "chrome/browser/google/google_url_tracker_factory.h" | 33 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 34 #include "chrome/browser/gpu/gl_string_manager.h" | 34 #include "chrome/browser/gpu/gl_string_manager.h" |
| 35 #include "chrome/browser/gpu/gpu_mode_manager.h" | 35 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 36 #include "chrome/browser/intranet_redirect_detector.h" | 36 #include "chrome/browser/intranet_redirect_detector.h" |
| 37 #include "chrome/browser/io_thread.h" | 37 #include "chrome/browser/io_thread.h" |
| 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 39 #include "chrome/browser/media/media_device_id_salt.h" | 39 #include "chrome/browser/media/media_device_id_salt.h" |
| 40 #include "chrome/browser/media/media_stream_devices_controller.h" | 40 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 41 #include "chrome/browser/metrics/metrics_log.h" | |
| 42 #include "chrome/browser/metrics/metrics_service.h" | 41 #include "chrome/browser/metrics/metrics_service.h" |
| 43 #include "chrome/browser/metrics/variations/variations_service.h" | 42 #include "chrome/browser/metrics/variations/variations_service.h" |
| 44 #include "chrome/browser/net/http_server_properties_manager.h" | 43 #include "chrome/browser/net/http_server_properties_manager.h" |
| 45 #include "chrome/browser/net/net_pref_observer.h" | 44 #include "chrome/browser/net/net_pref_observer.h" |
| 46 #include "chrome/browser/net/predictor.h" | 45 #include "chrome/browser/net/predictor.h" |
| 47 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 48 #include "chrome/browser/net/ssl_config_service_manager.h" | 47 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 49 #include "chrome/browser/network_time/network_time_service.h" | 48 #include "chrome/browser/network_time/network_time_service.h" |
| 50 #include "chrome/browser/notifications/desktop_notification_service.h" | 49 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 51 #include "chrome/browser/notifications/message_center_notification_manager.h" | 50 #include "chrome/browser/notifications/message_center_notification_manager.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 chrome_variations::VariationsService::RegisterPrefs(registry); | 224 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 226 component_updater::RegisterPrefsForRecoveryComponent(registry); | 225 component_updater::RegisterPrefsForRecoveryComponent(registry); |
| 227 ExternalProtocolHandler::RegisterPrefs(registry); | 226 ExternalProtocolHandler::RegisterPrefs(registry); |
| 228 FlagsUI::RegisterPrefs(registry); | 227 FlagsUI::RegisterPrefs(registry); |
| 229 geolocation::RegisterPrefs(registry); | 228 geolocation::RegisterPrefs(registry); |
| 230 GLStringManager::RegisterPrefs(registry); | 229 GLStringManager::RegisterPrefs(registry); |
| 231 GpuModeManager::RegisterPrefs(registry); | 230 GpuModeManager::RegisterPrefs(registry); |
| 232 IntranetRedirectDetector::RegisterPrefs(registry); | 231 IntranetRedirectDetector::RegisterPrefs(registry); |
| 233 IOThread::RegisterPrefs(registry); | 232 IOThread::RegisterPrefs(registry); |
| 234 KeywordEditorController::RegisterPrefs(registry); | 233 KeywordEditorController::RegisterPrefs(registry); |
| 235 MetricsLog::RegisterPrefs(registry); | |
| 236 MetricsService::RegisterPrefs(registry); | 234 MetricsService::RegisterPrefs(registry); |
| 237 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 235 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 238 ProfileInfoCache::RegisterPrefs(registry); | 236 ProfileInfoCache::RegisterPrefs(registry); |
| 239 profiles::RegisterPrefs(registry); | 237 profiles::RegisterPrefs(registry); |
| 240 PromoResourceService::RegisterPrefs(registry); | 238 PromoResourceService::RegisterPrefs(registry); |
| 241 rappor::RapporService::RegisterPrefs(registry); | 239 rappor::RapporService::RegisterPrefs(registry); |
| 242 RegisterScreenshotPrefs(registry); | 240 RegisterScreenshotPrefs(registry); |
| 243 SigninManagerFactory::RegisterPrefs(registry); | 241 SigninManagerFactory::RegisterPrefs(registry); |
| 244 SSLConfigServiceManager::RegisterPrefs(registry); | 242 SSLConfigServiceManager::RegisterPrefs(registry); |
| 245 UpgradeDetector::RegisterPrefs(registry); | 243 UpgradeDetector::RegisterPrefs(registry); |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 572 current_version); | 570 current_version); |
| 573 } | 571 } |
| 574 | 572 |
| 575 #if defined(OS_CHROMEOS) | 573 #if defined(OS_CHROMEOS) |
| 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 577 #endif | 575 #endif |
| 578 } | 576 } |
| 579 | 577 |
| 580 } // namespace chrome | 578 } // namespace chrome |
| OLD | NEW |