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

Unified Diff: content/browser/frame_host/render_frame_message_filter.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 | « content/browser/frame_host/debug_urls.cc ('k') | content/browser/frame_host/render_frame_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_message_filter.h
diff --git a/content/browser/frame_host/render_frame_message_filter.h b/content/browser/frame_host/render_frame_message_filter.h
index fa7fe99e1a36f99017c8eed89e994fb7a2801531..b25224c14636cbe1d8dd417913d185e397be8474 100644
--- a/content/browser/frame_host/render_frame_message_filter.h
+++ b/content/browser/frame_host/render_frame_message_filter.h
@@ -15,9 +15,10 @@
#include "content/public/browser/browser_message_filter.h"
#include "content/public/common/three_d_api_types.h"
#include "net/cookies/canonical_cookie.h"
+#include "ppapi/features/features.h"
#include "third_party/WebKit/public/web/WebTreeScopeType.h"
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/common/pepper_renderer_instance_data.h"
#endif
@@ -123,7 +124,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter
const GetCookiesCallback& callback) override;
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
void OnGetPlugins(bool refresh,
const url::Origin& main_frame_origin,
IPC::Message* reply_msg);
@@ -159,7 +160,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter
// Only call on the IO thread.
net::URLRequestContext* GetRequestContextForURL(const GURL& url);
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
PluginServiceImpl* plugin_service_;
base::FilePath profile_data_directory_;
« no previous file with comments | « content/browser/frame_host/debug_urls.cc ('k') | content/browser/frame_host/render_frame_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698