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 19 matching lines...) Expand all Loading... |
30 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 30 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
31 #include "chrome/browser/first_run/first_run.h" | 31 #include "chrome/browser/first_run/first_run.h" |
32 #include "chrome/browser/geolocation/geolocation_prefs.h" | 32 #include "chrome/browser/geolocation/geolocation_prefs.h" |
33 #include "chrome/browser/google/google_url_tracker.h" | 33 #include "chrome/browser/google/google_url_tracker.h" |
34 #include "chrome/browser/google/google_url_tracker_factory.h" | 34 #include "chrome/browser/google/google_url_tracker_factory.h" |
35 #include "chrome/browser/gpu/gl_string_manager.h" | 35 #include "chrome/browser/gpu/gl_string_manager.h" |
36 #include "chrome/browser/gpu/gpu_mode_manager.h" | 36 #include "chrome/browser/gpu/gpu_mode_manager.h" |
37 #include "chrome/browser/intranet_redirect_detector.h" | 37 #include "chrome/browser/intranet_redirect_detector.h" |
38 #include "chrome/browser/io_thread.h" | 38 #include "chrome/browser/io_thread.h" |
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 40 #include "chrome/browser/media/media_device_id_salt.h" |
40 #include "chrome/browser/media/media_stream_devices_controller.h" | 41 #include "chrome/browser/media/media_stream_devices_controller.h" |
41 #include "chrome/browser/metrics/metrics_log.h" | 42 #include "chrome/browser/metrics/metrics_log.h" |
42 #include "chrome/browser/metrics/metrics_service.h" | 43 #include "chrome/browser/metrics/metrics_service.h" |
43 #include "chrome/browser/metrics/variations/variations_service.h" | 44 #include "chrome/browser/metrics/variations/variations_service.h" |
44 #include "chrome/browser/net/http_server_properties_manager.h" | 45 #include "chrome/browser/net/http_server_properties_manager.h" |
45 #include "chrome/browser/net/net_pref_observer.h" | 46 #include "chrome/browser/net/net_pref_observer.h" |
46 #include "chrome/browser/net/predictor.h" | 47 #include "chrome/browser/net/predictor.h" |
47 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 48 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
48 #include "chrome/browser/net/ssl_config_service_manager.h" | 49 #include "chrome/browser/net/ssl_config_service_manager.h" |
49 #include "chrome/browser/network_time/network_time_service.h" | 50 #include "chrome/browser/network_time/network_time_service.h" |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 registry); | 340 registry); |
340 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 341 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
341 DownloadPrefs::RegisterProfilePrefs(registry); | 342 DownloadPrefs::RegisterProfilePrefs(registry); |
342 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 343 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
343 ExtensionWebUI::RegisterProfilePrefs(registry); | 344 ExtensionWebUI::RegisterProfilePrefs(registry); |
344 HostContentSettingsMap::RegisterProfilePrefs(registry); | 345 HostContentSettingsMap::RegisterProfilePrefs(registry); |
345 IncognitoModePrefs::RegisterProfilePrefs(registry); | 346 IncognitoModePrefs::RegisterProfilePrefs(registry); |
346 InstantUI::RegisterProfilePrefs(registry); | 347 InstantUI::RegisterProfilePrefs(registry); |
347 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 348 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
348 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 349 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 350 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
349 NetPrefObserver::RegisterProfilePrefs(registry); | 351 NetPrefObserver::RegisterProfilePrefs(registry); |
350 NetworkTimeService::RegisterProfilePrefs(registry); | 352 NetworkTimeService::RegisterProfilePrefs(registry); |
351 NewTabUI::RegisterProfilePrefs(registry); | 353 NewTabUI::RegisterProfilePrefs(registry); |
352 #if !defined(OS_ANDROID) | 354 #if !defined(OS_ANDROID) |
353 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); | 355 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); |
354 #endif // OS_ANDROID | 356 #endif // OS_ANDROID |
355 PasswordGenerationManager::RegisterProfilePrefs(registry); | 357 PasswordGenerationManager::RegisterProfilePrefs(registry); |
356 PasswordManager::RegisterProfilePrefs(registry); | 358 PasswordManager::RegisterProfilePrefs(registry); |
357 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 359 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
358 PrefsTabHelper::RegisterProfilePrefs(registry); | 360 PrefsTabHelper::RegisterProfilePrefs(registry); |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 } | 567 } |
566 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 568 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
567 | 569 |
568 current_version |= GOOGLE_URL_TRACKER_PREFS; | 570 current_version |= GOOGLE_URL_TRACKER_PREFS; |
569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
570 current_version); | 572 current_version); |
571 } | 573 } |
572 } | 574 } |
573 | 575 |
574 } // namespace chrome | 576 } // namespace chrome |
OLD | NEW |