mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-05 22:48:06 +01:00
6df612a597
- The |category| value for all TRACE calls from CEF client applications is now "cef.client" due to https://crrev.com/331266377d. - The |with_menu_marker| parameter to CreateMenuButton has been removed due to https://crrev.com/7f7e382118.
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
|
|
index 310971aadad2..1c9f77745f09 100644
|
|
--- chrome/common/chrome_content_client.cc
|
|
+++ chrome/common/chrome_content_client.cc
|
|
@@ -99,7 +99,8 @@
|
|
// 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(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
|
|
+ defined(WIDEVINE_CDM_VERSION_STRING)
|
|
#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 --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
|
|
index 4826777cffd2..a5835928dbad 100644
|
|
--- third_party/widevine/cdm/BUILD.gn
|
|
+++ third_party/widevine/cdm/BUILD.gn
|
|
@@ -5,6 +5,7 @@
|
|
import("//build/buildflag_header.gni")
|
|
import("//build/config/chrome_build.gni")
|
|
import("//build/config/features.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//media/cdm/library_cdm/cdm_paths.gni")
|
|
import("//media/media_options.gni")
|
|
import("//third_party/widevine/cdm/widevine.gni")
|