chrome/renderer/pepper/pepper_uma_host.cc - Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS 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/renderer/pepper/pepper_uma_host.cc

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)

Patch Set: Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/renderer/pepper/pepper_uma_host.cc

diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc

index d9bd7a417f1a978b14959cd8412695f19643cac8..417483843899d8ab22b9410f6d384025301814a6 100644

--- a/chrome/renderer/pepper/pepper_uma_host.cc

+++ b/chrome/renderer/pepper/pepper_uma_host.cc

@@ -19,7 +19,6 @@

#include "content/public/renderer/render_thread.h"

#include "content/public/renderer/renderer_ppapi_host.h"

#include "ppapi/c/pp_errors.h"

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

#include "ppapi/host/dispatch_host_message.h"

#include "ppapi/host/host_message_context.h"

#include "ppapi/host/ppapi_host.h"

@@ -52,7 +51,7 @@

};

const char* const kWhitelistedPluginBaseNames[] = {

-#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS)

+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)

kWidevineCdmAdapterFileName, // see http://crbug.com/368743

// and http://crbug.com/410630

#endif

« no previous file with comments | « chrome/renderer/media/chrome_key_systems.cc ('k') | chrome/renderer/plugins/plugin_uma.cc » ('j') | no next file with comments »