| 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 82ce0c62007128199446019739c708002c343722..144aacb621028ed2251ce6292bf95c0629f12f83 100644
|
| --- a/third_party/widevine/cdm/widevine_cdm_common.h
|
| +++ b/third_party/widevine/cdm/widevine_cdm_common.h
|
| @@ -19,9 +19,11 @@ const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module";
|
| // Will be parsed as HTML.
|
| const char kWidevineCdmDescription[] =
|
| "Enables Widevine licenses for playback of HTML audio/video content.";
|
| -const char kWidevineCdmPluginMimeType[] ="application/x-ppapi-widevine-cdm";
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| +const char kWidevineCdmPluginMimeType[] = "application/x-ppapi-widevine-cdm";
|
| const char kWidevineCdmPluginMimeTypeDescription[] =
|
| "Widevine Content Decryption Module";
|
| +#endif
|
|
|
| // File name of the CDM on different platforms.
|
| const base::FilePath::CharType kWidevineCdmFileName[] =
|
| @@ -33,6 +35,7 @@ const base::FilePath::CharType kWidevineCdmFileName[] =
|
| FILE_PATH_LITERAL("libwidevinecdm.so");
|
| #endif
|
|
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| // File name of the adapter on different platforms.
|
| const base::FilePath::CharType kWidevineCdmAdapterFileName[] =
|
| #if defined(OS_MACOSX)
|
| @@ -42,8 +45,10 @@ const base::FilePath::CharType kWidevineCdmAdapterFileName[] =
|
| #else // OS_LINUX, etc.
|
| FILE_PATH_LITERAL("libwidevinecdmadapter.so");
|
| #endif
|
| +#endif // defined(ENABLE_PEPPER_CDMS)
|
| +
|
|
|
| -#if defined(OS_MACOSX) || defined(OS_WIN)
|
| +#if defined(ENABLE_PEPPER_CDMS) && (defined(OS_MACOSX) || defined(OS_WIN))
|
| // CDM is installed by the component installer instead of the Chrome installer.
|
| #define WIDEVINE_CDM_IS_COMPONENT
|
| #endif
|
|
|