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

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

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

index 9b50b1a98e881bdc50ab80ab57eaa5c4d124f3d8..d0ed06fd875505452bb5b4c943734316c1dfa665 100644

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

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

@@ -9,11 +9,10 @@

#include "build/build_config.h"

#include "media/base/key_system_properties.h"

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

namespace cdm {

-#if BUILDFLAG(ENABLE_PEPPER_CDMS)

+#if defined(ENABLE_PEPPER_CDMS)

extern const char kExternalClearKeyPepperType[];

#endif

@@ -36,7 +35,7 @@

const override;

media::EmeFeatureSupport GetPersistentStateSupport() const override;

media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override;

-#if BUILDFLAG(ENABLE_PEPPER_CDMS)

+#if defined(ENABLE_PEPPER_CDMS)

std::string GetPepperType() const override;

#endif