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/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/net/predictor.h" | 37 #include "chrome/browser/net/predictor.h" |
38 #include "chrome/browser/notifications/extension_welcome_notification.h" | 38 #include "chrome/browser/notifications/extension_welcome_notification.h" |
39 #include "chrome/browser/notifications/notifier_state_tracker.h" | 39 #include "chrome/browser/notifications/notifier_state_tracker.h" |
40 #include "chrome/browser/pepper_flash_settings_manager.h" | 40 #include "chrome/browser/pepper_flash_settings_manager.h" |
41 #include "chrome/browser/plugins/plugin_finder.h" | 41 #include "chrome/browser/plugins/plugin_finder.h" |
42 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 42 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
43 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 43 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
44 #include "chrome/browser/prefs/origin_trial_prefs.h" | 44 #include "chrome/browser/prefs/origin_trial_prefs.h" |
45 #include "chrome/browser/prefs/session_startup_pref.h" | 45 #include "chrome/browser/prefs/session_startup_pref.h" |
46 #include "chrome/browser/profiles/chrome_version_service.h" | 46 #include "chrome/browser/profiles/chrome_version_service.h" |
| 47 #include "chrome/browser/profiles/net_http_session_params_observer.h" |
47 #include "chrome/browser/profiles/profile.h" | 48 #include "chrome/browser/profiles/profile.h" |
48 #include "chrome/browser/profiles/profile_impl.h" | 49 #include "chrome/browser/profiles/profile_impl.h" |
49 #include "chrome/browser/profiles/profile_info_cache.h" | 50 #include "chrome/browser/profiles/profile_info_cache.h" |
50 #include "chrome/browser/profiles/profiles_state.h" | 51 #include "chrome/browser/profiles/profiles_state.h" |
51 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" | 52 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" |
52 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 53 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
53 #include "chrome/browser/search/search.h" | 54 #include "chrome/browser/search/search.h" |
54 #include "chrome/browser/signin/signin_manager_factory.h" | 55 #include "chrome/browser/signin/signin_manager_factory.h" |
55 #include "chrome/browser/task_manager/task_manager_interface.h" | 56 #include "chrome/browser/task_manager/task_manager_interface.h" |
56 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 57 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 chrome_prefs::RegisterProfilePrefs(registry); | 490 chrome_prefs::RegisterProfilePrefs(registry); |
490 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 491 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
491 DownloadPrefs::RegisterProfilePrefs(registry); | 492 DownloadPrefs::RegisterProfilePrefs(registry); |
492 HostContentSettingsMap::RegisterProfilePrefs(registry); | 493 HostContentSettingsMap::RegisterProfilePrefs(registry); |
493 IncognitoModePrefs::RegisterProfilePrefs(registry); | 494 IncognitoModePrefs::RegisterProfilePrefs(registry); |
494 InstantUI::RegisterProfilePrefs(registry); | 495 InstantUI::RegisterProfilePrefs(registry); |
495 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 496 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
496 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 497 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
497 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 498 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
498 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 499 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 500 NetHttpSessionParamsObserver::RegisterProfilePrefs(registry); |
499 NotifierStateTracker::RegisterProfilePrefs(registry); | 501 NotifierStateTracker::RegisterProfilePrefs(registry); |
500 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); | 502 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); |
501 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); | 503 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); |
502 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( | 504 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( |
503 registry); | 505 registry); |
504 ntp_snippets::RemoteSuggestionsProviderImpl::RegisterProfilePrefs(registry); | 506 ntp_snippets::RemoteSuggestionsProviderImpl::RegisterProfilePrefs(registry); |
505 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); | 507 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); |
506 ntp_snippets::SchedulingRemoteSuggestionsProvider::RegisterProfilePrefs( | 508 ntp_snippets::SchedulingRemoteSuggestionsProvider::RegisterProfilePrefs( |
507 registry); | 509 registry); |
508 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); | 510 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 // Added 8/2016. | 799 // Added 8/2016. |
798 profile_prefs->ClearPref(kStaticEncodings); | 800 profile_prefs->ClearPref(kStaticEncodings); |
799 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 801 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
800 | 802 |
801 // Added 9/2016. | 803 // Added 9/2016. |
802 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 804 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
803 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 805 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
804 } | 806 } |
805 | 807 |
806 } // namespace chrome | 808 } // namespace chrome |
OLD | NEW |