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

Unified Diff: chromecast/shell/renderer/key_systems_cast.cc

Issue 606483002: Chromecast: adds AddKeySystemWithCodecs to key_systems_cast header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « chromecast/shell/renderer/key_systems_cast.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/shell/renderer/key_systems_cast.cc
diff --git a/chromecast/shell/renderer/key_systems_cast.cc b/chromecast/shell/renderer/key_systems_cast.cc
index 8e9fe4d61c30d01a7c343e5dd7d1c45e514d7bd8..ceffef5f0c7f51f26c9b4b5dedffd1fd2eaf3336 100644
--- a/chromecast/shell/renderer/key_systems_cast.cc
+++ b/chromecast/shell/renderer/key_systems_cast.cc
@@ -14,9 +14,9 @@
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
-namespace {
+namespace chromecast {
+namespace shell {
-#if defined(PLAYREADY_CDM_AVAILABLE)
void AddKeySystemWithCodecs(
const std::string& key_system_name,
std::vector<content::KeySystemInfo>* concrete_key_systems) {
@@ -24,12 +24,6 @@ void AddKeySystemWithCodecs(
info.supported_codecs = content::EME_CODEC_MP4_ALL;
concrete_key_systems->push_back(info);
}
-#endif // defined(PLAYREADY_CDM_AVAILABLE)
-
-} // namespace
-
-namespace chromecast {
-namespace shell {
void AddChromecastKeySystems(
std::vector<content::KeySystemInfo>* key_systems_info) {
@@ -40,7 +34,8 @@ void AddChromecastKeySystems(
#endif
#if defined(PLAYREADY_CDM_AVAILABLE)
- AddKeySystemWithCodecs(kChromecastPlayreadyKeySystem, key_systems_info);
+ AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
+ key_systems_info);
#endif
}
« no previous file with comments | « chromecast/shell/renderer/key_systems_cast.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698