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

Unified Diff: chrome/renderer/chrome_content_renderer_client.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/renderer/BUILD.gn ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.h
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 4f7bbbbc2eed67563eea118cd95dd09fc8a3a1f9..09377ed8221b236ea98eb79124dfe5f3f3f8695e 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -21,6 +21,7 @@
#include "content/public/renderer/content_renderer_client.h"
#include "extensions/features/features.h"
#include "ipc/ipc_channel_proxy.h"
+#include "ppapi/features/features.h"
#include "printing/features/features.h"
#include "v8/include/v8.h"
@@ -193,7 +194,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
void SetSpellcheck(SpellCheck* spellcheck);
#endif
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
static blink::WebPlugin* CreatePlugin(
content::RenderFrame* render_frame,
blink::WebLocalFrame* frame,
@@ -201,7 +202,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
const ChromeViewHostMsg_GetPluginInfo_Output& output);
#endif
-#if defined(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
static bool IsExtensionOrSharedModuleWhitelisted(
const GURL& url, const std::set<std::string>& whitelist);
#endif
@@ -249,7 +250,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
std::unique_ptr<ChromePDFPrintClient> pdf_print_client_;
#endif
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
std::set<std::string> allowed_camera_device_origins_;
std::set<std::string> allowed_compositor_origins_;
#endif
« no previous file with comments | « chrome/renderer/BUILD.gn ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698