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

Unified Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 960793002: Restore L3 support on CrOS when the media permission is denied. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2311
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « no previous file | media/base/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/chrome_key_systems.cc
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index 6ab58435e2ec574da1d3255cdc9cd4e1f5a67655..714c6697d964b5c5be14b55af95040b14de1f3d8 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -190,8 +190,7 @@ static void AddPepperBasedWidevine(
}
cdm::AddWidevineWithCodecs(
- cdm::WIDEVINE,
- supported_codecs,
+ cdm::WIDEVINE, supported_codecs,
#if defined(OS_CHROMEOS)
// Persistent licenses are supported if remote attestation succeeds.
media::EME_SESSION_TYPE_SUPPORTED_WITH_PERMISSION,
@@ -199,21 +198,18 @@ static void AddPepperBasedWidevine(
// TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
// succeeding. Change this to REQUESTABLE once the state can be blocked.
// http://crbug.com/457482
- media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state.
+ media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state.
// A distinctive identifier will be available if remote attestation
// succeeds.
- // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
- // succeeding. Change this to REQUESTABLE_WITH_PERMISSION once the
- // distinctive identifier can be blocked. http://crbug.com/457482
- media::EME_FEATURE_ALWAYS_ENABLED,
+ media::EME_FEATURE_REQUESTABLE_WITH_PERMISSION,
#else // (Desktop)
media::EME_SESSION_TYPE_NOT_SUPPORTED, // Persistent license.
media::EME_SESSION_TYPE_NOT_SUPPORTED, // Persistent release message.
// TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from
// succeeding. Change this to REQUESTABLE once the state can be blocked.
// http://crbug.com/457482
- media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state.
- media::EME_FEATURE_NOT_SUPPORTED, // Distinctive identifier.
+ media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state.
+ media::EME_FEATURE_NOT_SUPPORTED, // Distinctive identifier.
#endif // defined(OS_CHROMEOS)
concrete_key_systems);
}
« no previous file with comments | « no previous file | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698