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

Unified Diff: chrome/browser/profiles/profile_impl.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 774779595c24c70a5f8e45b882d285e5064428f7..9c4752f9e99322b3d7c62c50f15fe83525a7a52e 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -115,6 +115,7 @@
#include "content/public/common/content_constants.h"
#include "content/public/common/page_zoom.h"
#include "extensions/features/features.h"
+#include "ppapi/features/features.h"
#include "printing/features/features.h"
#include "ui/base/l10n/l10n_util.h"
@@ -621,7 +622,7 @@ void ProfileImpl::DoFinalInit() {
session_cookie_mode, GetSpecialStoragePolicy(),
CreateDomainReliabilityMonitor(local_state));
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
this, io_data_.GetResourceContextNoInit());
#endif
@@ -688,7 +689,7 @@ ProfileImpl::~ProfileImpl() {
// Remove pref observers
pref_change_registrar_.RemoveAll();
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
io_data_.GetResourceContextNoInit());
#endif

Powered by Google App Engine
This is Rietveld 408576698