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

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

Issue 2669873002: [ImportantSites] Implementing dialog level blacklisting and blacklist expiration (Closed)
Patch Set: android compile Created 3 years, 10 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
« no previous file with comments | « chrome/browser/engagement/important_sites_util_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/about_flags.h" 13 #include "chrome/browser/about_flags.h"
14 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 14 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
15 #include "chrome/browser/browser_process_impl.h" 15 #include "chrome/browser/browser_process_impl.h"
16 #include "chrome/browser/browser_shutdown.h" 16 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/budget_service/budget_manager.h" 17 #include "chrome/browser/budget_service/budget_manager.h"
18 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
19 #include "chrome/browser/component_updater/component_updater_prefs.h" 19 #include "chrome/browser/component_updater/component_updater_prefs.h"
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
21 #include "chrome/browser/devtools/devtools_window.h" 21 #include "chrome/browser/devtools/devtools_window.h"
22 #include "chrome/browser/download/download_prefs.h" 22 #include "chrome/browser/download/download_prefs.h"
23 #include "chrome/browser/engagement/important_sites_util.h"
23 #include "chrome/browser/external_protocol/external_protocol_handler.h" 24 #include "chrome/browser/external_protocol/external_protocol_handler.h"
24 #include "chrome/browser/first_run/first_run.h" 25 #include "chrome/browser/first_run/first_run.h"
25 #include "chrome/browser/geolocation/geolocation_prefs.h" 26 #include "chrome/browser/geolocation/geolocation_prefs.h"
26 #include "chrome/browser/gpu/gpu_mode_manager.h" 27 #include "chrome/browser/gpu/gpu_mode_manager.h"
27 #include "chrome/browser/gpu/gpu_profile_cache.h" 28 #include "chrome/browser/gpu/gpu_profile_cache.h"
28 #include "chrome/browser/intranet_redirect_detector.h" 29 #include "chrome/browser/intranet_redirect_detector.h"
29 #include "chrome/browser/io_thread.h" 30 #include "chrome/browser/io_thread.h"
30 #include "chrome/browser/media/media_device_id_salt.h" 31 #include "chrome/browser/media/media_device_id_salt.h"
31 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 32 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
32 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h" 33 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 482 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
482 ChromeVersionService::RegisterProfilePrefs(registry); 483 ChromeVersionService::RegisterProfilePrefs(registry);
483 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 484 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
484 registry); 485 registry);
485 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 486 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
486 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 487 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
487 chrome_prefs::RegisterProfilePrefs(registry); 488 chrome_prefs::RegisterProfilePrefs(registry);
488 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 489 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
489 DownloadPrefs::RegisterProfilePrefs(registry); 490 DownloadPrefs::RegisterProfilePrefs(registry);
490 HostContentSettingsMap::RegisterProfilePrefs(registry); 491 HostContentSettingsMap::RegisterProfilePrefs(registry);
492 ImportantSitesUtil::RegisterProfilePrefs(registry);
491 IncognitoModePrefs::RegisterProfilePrefs(registry); 493 IncognitoModePrefs::RegisterProfilePrefs(registry);
492 InstantUI::RegisterProfilePrefs(registry); 494 InstantUI::RegisterProfilePrefs(registry);
493 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 495 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
494 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 496 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
495 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 497 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
496 MediaStreamDevicesController::RegisterProfilePrefs(registry); 498 MediaStreamDevicesController::RegisterProfilePrefs(registry);
497 NetHttpSessionParamsObserver::RegisterProfilePrefs(registry); 499 NetHttpSessionParamsObserver::RegisterProfilePrefs(registry);
498 NotifierStateTracker::RegisterProfilePrefs(registry); 500 NotifierStateTracker::RegisterProfilePrefs(registry);
499 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); 501 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry);
500 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); 502 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry);
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 // Added 8/2016. 794 // Added 8/2016.
793 profile_prefs->ClearPref(kStaticEncodings); 795 profile_prefs->ClearPref(kStaticEncodings);
794 profile_prefs->ClearPref(kRecentlySelectedEncoding); 796 profile_prefs->ClearPref(kRecentlySelectedEncoding);
795 797
796 // Added 9/2016. 798 // Added 9/2016.
797 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 799 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
798 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 800 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
799 } 801 }
800 802
801 } // namespace chrome 803 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/engagement/important_sites_util_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698