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

Unified Diff: chrome/common/pref_names.h

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
« no previous file with comments | « chrome/common/features.gni ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 823d4ecca344ba8c180c3abb840714670ddf817c..8fcfbfc8fef7a9d683be5493d22ea9ced944e841 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -12,6 +12,7 @@
#include "build/build_config.h"
#include "chrome/common/features.h"
#include "extensions/features/features.h"
+#include "ppapi/features/features.h"
namespace prefs {
@@ -339,7 +340,7 @@ extern const char kPluginsDisabledPlugins[];
extern const char kPluginsDisabledPluginsExceptions[];
extern const char kPluginsEnabledPlugins[];
extern const char kPluginsAlwaysOpenPdfExternally[];
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
extern const char kPluginsShowDetails[];
#endif
extern const char kPluginsAllowOutdated[];
@@ -358,7 +359,7 @@ extern const char kShowUpdatePromotionInfoBar[];
extern const char kUseCustomChromeFrame[];
#endif
extern const char kBackShortcutBubbleShownCount[];
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
extern const char kContentSettingsPluginWhitelist[];
#endif
extern const char kPartitionDefaultZoomLevel[];
« no previous file with comments | « chrome/common/features.gni ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698