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..856e9fccfd910f859a6187ed158861c2934ac661 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."; |
+#if defined(ENABLE_PEPPER_CDMS) |
const char kWidevineCdmPluginMimeType[] ="application/x-ppapi-widevine-cdm"; |
const char kWidevineCdmPluginMimeTypeDescription[] = |
"Widevine Content Decryption Module"; |
+#endif |
xhwang
2013/05/14 16:35:44
nit: #endif // defined(ENABLE_PEPPER_CDMS)
ddorwin
2013/05/14 20:14:28
Same.
|
// 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 |