third_party/widevine/cdm/widevine_cdm_common.h - Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

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: third_party/widevine/cdm/widevine_cdm_common.h

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 6 years 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

Index: third_party/widevine/cdm/widevine_cdm_common.h

diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h

index 9004555b8e54bf9c45b1e80eae2336e05b8e4032..7b0240bf685b9a62cb685f26eda9c447b75d38c3 100644

--- a/third_party/widevine/cdm/widevine_cdm_common.h

+++ b/third_party/widevine/cdm/widevine_cdm_common.h

@@ -5,6 +5,8 @@

#ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_

#define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_

+#if defined(ENABLE_WIDEVINE_CDM)

#include "base/files/file_path.h"

// This file defines constants common to all Widevine CDM versions.

@@ -60,10 +62,6 @@ const char kCdmSupportedCodecAac[] = "aac";

const char kCdmSupportedCodecAvc1[] = "avc1";

#endif // defined(USE_PROPRIETARY_CODECS)

ddorwin 2014/12/15 21:56:48 Restore #endif // defined(ENABLE_PEPPER_CDMS) bel

-#if defined(OS_MACOSX) || defined(OS_WIN)

-// CDM is installed by the component installer instead of the Chrome installer.

-#define WIDEVINE_CDM_IS_COMPONENT

-#endif // defined(OS_MACOSX) || defined(OS_WIN)

-#endif // defined(ENABLE_PEPPER_CDMS)

+#endif // defined(ENABLE_WIDEVINE_CDM)

#endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_

« no previous file with comments | « third_party/widevine/cdm/widevine_cdm.gyp ('k') | third_party/widevine/cdm/widevine_cdm_version.h » ('j') | no next file with comments »