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

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

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #include "components/sync/base/sync_prefs.h" 101 #include "components/sync/base/sync_prefs.h"
102 #include "components/sync_preferences/pref_service_syncable.h" 102 #include "components/sync_preferences/pref_service_syncable.h"
103 #include "components/translate/core/browser/language_model.h" 103 #include "components/translate/core/browser/language_model.h"
104 #include "components/translate/core/browser/translate_prefs.h" 104 #include "components/translate/core/browser/translate_prefs.h"
105 #include "components/update_client/update_client.h" 105 #include "components/update_client/update_client.h"
106 #include "components/variations/service/variations_service.h" 106 #include "components/variations/service/variations_service.h"
107 #include "content/public/browser/browser_thread.h" 107 #include "content/public/browser/browser_thread.h"
108 #include "content/public/browser/render_process_host.h" 108 #include "content/public/browser/render_process_host.h"
109 #include "extensions/features/features.h" 109 #include "extensions/features/features.h"
110 #include "net/http/http_server_properties_manager.h" 110 #include "net/http/http_server_properties_manager.h"
111 #include "ppapi/features/features.h"
111 #include "printing/features/features.h" 112 #include "printing/features/features.h"
112 113
113 #if BUILDFLAG(ENABLE_APP_LIST) 114 #if BUILDFLAG(ENABLE_APP_LIST)
114 #include "chrome/browser/apps/drive/drive_app_mapping.h" 115 #include "chrome/browser/apps/drive/drive_app_mapping.h"
115 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" 116 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
116 #endif 117 #endif
117 118
118 #if BUILDFLAG(ENABLE_BACKGROUND) 119 #if BUILDFLAG(ENABLE_BACKGROUND)
119 #include "chrome/browser/background/background_mode_manager.h" 120 #include "chrome/browser/background/background_mode_manager.h"
120 #endif 121 #endif
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 startup_metric_utils::RegisterPrefs(registry); 371 startup_metric_utils::RegisterPrefs(registry);
371 update_client::RegisterPrefs(registry); 372 update_client::RegisterPrefs(registry);
372 373
373 policy::BrowserPolicyConnector::RegisterPrefs(registry); 374 policy::BrowserPolicyConnector::RegisterPrefs(registry);
374 policy::PolicyStatisticsCollector::RegisterPrefs(registry); 375 policy::PolicyStatisticsCollector::RegisterPrefs(registry);
375 376
376 #if BUILDFLAG(ENABLE_EXTENSIONS) 377 #if BUILDFLAG(ENABLE_EXTENSIONS)
377 EasyUnlockService::RegisterPrefs(registry); 378 EasyUnlockService::RegisterPrefs(registry);
378 #endif 379 #endif
379 380
380 #if defined(ENABLE_PLUGINS) 381 #if BUILDFLAG(ENABLE_PLUGINS)
381 PluginFinder::RegisterPrefs(registry); 382 PluginFinder::RegisterPrefs(registry);
382 #endif 383 #endif
383 384
384 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) 385 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
385 PluginsResourceService::RegisterPrefs(registry); 386 PluginsResourceService::RegisterPrefs(registry);
386 #endif 387 #endif
387 388
388 #if defined(ENABLE_TASK_MANAGER) 389 #if defined(ENABLE_TASK_MANAGER)
389 task_manager::TaskManagerInterface::RegisterPrefs(registry); 390 task_manager::TaskManagerInterface::RegisterPrefs(registry);
390 #endif // defined(ENABLE_TASK_MANAGER) 391 #endif // defined(ENABLE_TASK_MANAGER)
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 NotifierStateTracker::RegisterProfilePrefs(registry); 532 NotifierStateTracker::RegisterProfilePrefs(registry);
532 #endif 533 #endif
533 534
534 #if defined(ENABLE_NOTIFICATIONS) && BUILDFLAG(ENABLE_EXTENSIONS) && \ 535 #if defined(ENABLE_NOTIFICATIONS) && BUILDFLAG(ENABLE_EXTENSIONS) && \
535 !defined(OS_ANDROID) 536 !defined(OS_ANDROID)
536 // The extension welcome notification requires a build that enables extensions 537 // The extension welcome notification requires a build that enables extensions
537 // and notifications, and uses the UI message center. 538 // and notifications, and uses the UI message center.
538 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 539 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
539 #endif 540 #endif
540 541
541 #if defined(ENABLE_PLUGINS) 542 #if BUILDFLAG(ENABLE_PLUGINS)
542 PluginsUI::RegisterProfilePrefs(registry); 543 PluginsUI::RegisterProfilePrefs(registry);
543 #endif 544 #endif
544 545
545 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) 546 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
546 printing::StickySettings::RegisterProfilePrefs(registry); 547 printing::StickySettings::RegisterProfilePrefs(registry);
547 #endif 548 #endif
548 549
549 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 550 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
550 LocalDiscoveryUI::RegisterProfilePrefs(registry); 551 LocalDiscoveryUI::RegisterProfilePrefs(registry);
551 #endif 552 #endif
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 // Added 8/2016. 782 // Added 8/2016.
782 profile_prefs->ClearPref(kStaticEncodings); 783 profile_prefs->ClearPref(kStaticEncodings);
783 profile_prefs->ClearPref(kRecentlySelectedEncoding); 784 profile_prefs->ClearPref(kRecentlySelectedEncoding);
784 785
785 // Added 9/2016. 786 // Added 9/2016.
786 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 787 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
787 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 788 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
788 } 789 }
789 790
790 } // namespace chrome 791 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698