components/cdm/renderer/external_clear_key_key_system_properties.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: components/cdm/renderer/external_clear_key_key_system_properties.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/cdm/renderer/external_clear_key_key_system_properties.h ('k') | components/cdm/renderer/widevine_key_system_properties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cdm/renderer/external_clear_key_key_system_properties.cc

diff --git a/components/cdm/renderer/external_clear_key_key_system_properties.cc b/components/cdm/renderer/external_clear_key_key_system_properties.cc

index 8e59f3558f0a9895df68bc1613ec713e4697e6c5..5771ec2af558afca3907879462cfd46cc6db421b 100644

--- a/components/cdm/renderer/external_clear_key_key_system_properties.cc

+++ b/components/cdm/renderer/external_clear_key_key_system_properties.cc

@@ -6,11 +6,10 @@

#include "base/logging.h"

#include "media/base/eme_constants.h"

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

namespace cdm {

-#if BUILDFLAG(ENABLE_PEPPER_CDMS)

+#if defined(ENABLE_PEPPER_CDMS)

const char kExternalClearKeyPepperType[] = "application/x-ppapi-clearkey-cdm";

#endif

@@ -81,7 +80,7 @@

return media::EmeFeatureSupport::NOT_SUPPORTED;

}

-#if BUILDFLAG(ENABLE_PEPPER_CDMS)

+#if defined(ENABLE_PEPPER_CDMS)

std::string ExternalClearKeyProperties::GetPepperType() const {

return kExternalClearKeyPepperType;

}