Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2369673004: Wire NQE Prefs to Profile (Closed)
Patch Set: Addressed bengr comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 14 matching lines...) Expand all
25 #include "chrome/browser/geolocation/geolocation_prefs.h" 25 #include "chrome/browser/geolocation/geolocation_prefs.h"
26 #include "chrome/browser/gpu/gpu_mode_manager.h" 26 #include "chrome/browser/gpu/gpu_mode_manager.h"
27 #include "chrome/browser/gpu/gpu_profile_cache.h" 27 #include "chrome/browser/gpu/gpu_profile_cache.h"
28 #include "chrome/browser/intranet_redirect_detector.h" 28 #include "chrome/browser/intranet_redirect_detector.h"
29 #include "chrome/browser/io_thread.h" 29 #include "chrome/browser/io_thread.h"
30 #include "chrome/browser/media/media_device_id_salt.h" 30 #include "chrome/browser/media/media_device_id_salt.h"
31 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 31 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
32 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h" 32 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
33 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 33 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
34 #include "chrome/browser/net/http_server_properties_manager_factory.h" 34 #include "chrome/browser/net/http_server_properties_manager_factory.h"
35 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service.h"
35 #include "chrome/browser/net/prediction_options.h" 36 #include "chrome/browser/net/prediction_options.h"
36 #include "chrome/browser/net/predictor.h" 37 #include "chrome/browser/net/predictor.h"
37 #include "chrome/browser/notifications/extension_welcome_notification.h" 38 #include "chrome/browser/notifications/extension_welcome_notification.h"
38 #include "chrome/browser/notifications/notifier_state_tracker.h" 39 #include "chrome/browser/notifications/notifier_state_tracker.h"
39 #include "chrome/browser/pepper_flash_settings_manager.h" 40 #include "chrome/browser/pepper_flash_settings_manager.h"
40 #include "chrome/browser/plugins/plugin_finder.h" 41 #include "chrome/browser/plugins/plugin_finder.h"
41 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 42 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
42 #include "chrome/browser/prefs/incognito_mode_prefs.h" 43 #include "chrome/browser/prefs/incognito_mode_prefs.h"
43 #include "chrome/browser/prefs/origin_trial_prefs.h" 44 #include "chrome/browser/prefs/origin_trial_prefs.h"
44 #include "chrome/browser/prefs/session_startup_pref.h" 45 #include "chrome/browser/prefs/session_startup_pref.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 PrefsTabHelper::RegisterProfilePrefs(registry); 494 PrefsTabHelper::RegisterProfilePrefs(registry);
494 Profile::RegisterProfilePrefs(registry); 495 Profile::RegisterProfilePrefs(registry);
495 ProfileImpl::RegisterProfilePrefs(registry); 496 ProfileImpl::RegisterProfilePrefs(registry);
496 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 497 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
497 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); 498 PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
498 RegisterBrowserUserPrefs(registry); 499 RegisterBrowserUserPrefs(registry);
499 SessionStartupPref::RegisterProfilePrefs(registry); 500 SessionStartupPref::RegisterProfilePrefs(registry);
500 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 501 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
501 translate::LanguageModel::RegisterProfilePrefs(registry); 502 translate::LanguageModel::RegisterProfilePrefs(registry);
502 translate::TranslatePrefs::RegisterProfilePrefs(registry); 503 translate::TranslatePrefs::RegisterProfilePrefs(registry);
504 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry);
503 ZeroSuggestProvider::RegisterProfilePrefs(registry); 505 ZeroSuggestProvider::RegisterProfilePrefs(registry);
504 browsing_data::prefs::RegisterBrowserUserPrefs(registry); 506 browsing_data::prefs::RegisterBrowserUserPrefs(registry);
505 507
506 #if defined(ENABLE_APP_LIST) 508 #if defined(ENABLE_APP_LIST)
507 app_list::AppListPrefs::RegisterProfilePrefs(registry); 509 app_list::AppListPrefs::RegisterProfilePrefs(registry);
508 #endif 510 #endif
509 511
510 policy::URLBlacklistManager::RegisterProfilePrefs(registry); 512 policy::URLBlacklistManager::RegisterProfilePrefs(registry);
511 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); 513 certificate_transparency::CTPolicyManager::RegisterPrefs(registry);
512 514
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 777 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 778 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 779 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 780
779 // Added 9/2016. 781 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 782 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 783 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 784 }
783 785
784 } // namespace chrome 786 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698