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

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

Issue 2630443002: Plugins: Remove chrome://plugins (Closed)
Patch Set: remove test Created 3 years, 11 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/browser_resources.grd ('k') | chrome/browser/resources/plugins.css » ('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"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "chrome/browser/ui/app_list/app_list_service.h" 57 #include "chrome/browser/ui/app_list/app_list_service.h"
58 #include "chrome/browser/ui/browser_ui_prefs.h" 58 #include "chrome/browser/ui/browser_ui_prefs.h"
59 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 59 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
60 #include "chrome/browser/ui/network_profile_bubble.h" 60 #include "chrome/browser/ui/network_profile_bubble.h"
61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
64 #include "chrome/browser/ui/webui/flags_ui.h" 64 #include "chrome/browser/ui/webui/flags_ui.h"
65 #include "chrome/browser/ui/webui/instant_ui.h" 65 #include "chrome/browser/ui/webui/instant_ui.h"
66 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 66 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
67 #include "chrome/browser/ui/webui/plugins/plugins_ui.h"
68 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 67 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
69 #include "chrome/common/features.h" 68 #include "chrome/common/features.h"
70 #include "chrome/common/pref_names.h" 69 #include "chrome/common/pref_names.h"
71 #include "components/autofill/core/browser/autofill_manager.h" 70 #include "components/autofill/core/browser/autofill_manager.h"
72 #include "components/browsing_data/core/pref_names.h" 71 #include "components/browsing_data/core/pref_names.h"
73 #include "components/certificate_transparency/ct_policy_manager.h" 72 #include "components/certificate_transparency/ct_policy_manager.h"
74 #include "components/content_settings/core/browser/host_content_settings_map.h" 73 #include "components/content_settings/core/browser/host_content_settings_map.h"
75 #include "components/dom_distiller/core/distilled_page_prefs.h" 74 #include "components/dom_distiller/core/distilled_page_prefs.h"
76 #include "components/flags_ui/pref_service_flags_storage.h" 75 #include "components/flags_ui/pref_service_flags_storage.h"
77 #include "components/gcm_driver/gcm_channel_status_syncer.h" 76 #include "components/gcm_driver/gcm_channel_status_syncer.h"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 extensions::launch_util::RegisterProfilePrefs(registry); 533 extensions::launch_util::RegisterProfilePrefs(registry);
535 extensions::RuntimeAPI::RegisterPrefs(registry); 534 extensions::RuntimeAPI::RegisterPrefs(registry);
536 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 535 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
537 536
538 #if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) 537 #if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID)
539 // The extension welcome notification requires a build that enables extensions 538 // The extension welcome notification requires a build that enables extensions
540 // and notifications, and uses the UI message center. 539 // and notifications, and uses the UI message center.
541 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 540 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
542 #endif 541 #endif
543 542
544 #if BUILDFLAG(ENABLE_PLUGINS)
545 PluginsUI::RegisterProfilePrefs(registry);
546 #endif
547
548 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) 543 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
549 printing::StickySettings::RegisterProfilePrefs(registry); 544 printing::StickySettings::RegisterProfilePrefs(registry);
550 #endif 545 #endif
551 546
552 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 547 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
553 LocalDiscoveryUI::RegisterProfilePrefs(registry); 548 LocalDiscoveryUI::RegisterProfilePrefs(registry);
554 #endif 549 #endif
555 550
556 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) 551 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
557 #if !defined(OS_ANDROID) 552 #if !defined(OS_ANDROID)
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 // Added 8/2016. 788 // Added 8/2016.
794 profile_prefs->ClearPref(kStaticEncodings); 789 profile_prefs->ClearPref(kStaticEncodings);
795 profile_prefs->ClearPref(kRecentlySelectedEncoding); 790 profile_prefs->ClearPref(kRecentlySelectedEncoding);
796 791
797 // Added 9/2016. 792 // Added 9/2016.
798 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 793 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
799 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 794 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
800 } 795 }
801 796
802 } // namespace chrome 797 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/plugins.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698