chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc - Issue 2512563003: Convert enable_plugins to a buildflag header.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.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

« no previous file with comments | « chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h ('k') | chrome/browser/metrics/chrome_metrics_service_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

index 57d0bd5aab3686a98037326399d852fb2b7aeff4..4324e865e31542b82eeb72eec6c983f4b50bbac9 100644

--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

@@ -18,6 +18,7 @@

#include "content/public/browser/user_metrics.h"

#include "extensions/browser/guest_view/web_view/web_view_constants.h"

#include "extensions/browser/guest_view/web_view/web_view_guest.h"

+#include "ppapi/features/features.h"

namespace extensions {

@@ -39,7 +40,7 @@ ChromeWebViewPermissionHelperDelegate::ChromeWebViewPermissionHelperDelegate(

ChromeWebViewPermissionHelperDelegate::~ChromeWebViewPermissionHelperDelegate()

{}

-#if defined(ENABLE_PLUGINS)

+#if BUILDFLAG(ENABLE_PLUGINS)

bool ChromeWebViewPermissionHelperDelegate::OnMessageReceived(

const IPC::Message& message,

content::RenderFrameHost* render_frame_host) {

@@ -119,7 +120,7 @@ void ChromeWebViewPermissionHelperDelegate::OnPermissionResponse(

}

-#endif // defined(ENABLE_PLUGINS)

+#endif // BUILDFLAG(ENABLE_PLUGINS)

void ChromeWebViewPermissionHelperDelegate::CanDownload(

const GURL& url,