Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1057)

Unified Diff: content/renderer/media/render_media_client.cc

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: Fix #endif 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: content/renderer/media/render_media_client.cc
diff --git a/content/renderer/media/render_media_client.cc b/content/renderer/media/render_media_client.cc
index 1922f3fbf2fa229e049ef9bacb38af884ccd5b61..2f7051cf90c1a4e53cee59f6211d0cc33be60a54 100644
--- a/content/renderer/media/render_media_client.cc
+++ b/content/renderer/media/render_media_client.cc
@@ -32,10 +32,10 @@ RenderMediaClient::~RenderMediaClient() {
void RenderMediaClient::AddKeySystemsInfoForUMA(
std::vector<media::KeySystemInfoForUMA>* key_systems_info_for_uma) {
DVLOG(2) << __FUNCTION__;
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if defined(ENABLE_WIDEVINE_CDM)
key_systems_info_for_uma->push_back(media::KeySystemInfoForUMA(
kWidevineKeySystem, kWidevineKeySystemNameForUMA, true));
-#endif // WIDEVINE_CDM_AVAILABLE
+#endif // ENABLE_WIDEVINE_CDM
}
bool RenderMediaClient::IsKeySystemsUpdateNeeded() {
@@ -76,7 +76,7 @@ void RenderMediaClient::AddSupportedKeySystems(
// Check whether all potentially supported key systems are supported. If so,
// no need to update again.
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
+#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
for (const media::KeySystemInfo& key_system_info : *key_systems_info) {
if (key_system_info.key_system == kWidevineKeySystem)
is_update_needed_ = false;
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.cc ('k') | content/renderer/media/render_media_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698