56079661fa
[ci skip]
26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
diff -upr chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
|
|
--- chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000
|
|
+++ chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000
|
|
@@ -99,7 +99,7 @@
|
|
// Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
|
|
// bundled and not a component. When the Widevine CDM is a component, it is
|
|
// registered in widevine_cdm_component_installer.cc.
|
|
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
|
+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
|
#define REGISTER_BUNDLED_WIDEVINE_CDM
|
|
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
|
|
// TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
|
|
|
|
diff -upr a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
|
|
--- third_party/widevine/cdm/widevine_cdm_version.h
|
|
+++ third_party/widevine/cdm/widevine_cdm_version.h
|
|
@@ -11,5 +11,6 @@
|
|
// If the Widevine CDM is available define the following:
|
|
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
|
|
// as a string, e.g., "1.0.123.456").
|
|
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
|
|
|
|
#endif // WIDEVINE_CDM_VERSION_H_
|
|
--
|
|
2.19.1
|
|
|