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

Unified Diff: chromecast/renderer/key_systems_cast.cc

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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/renderer/key_systems_cast.h ('k') | components/cdm.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/renderer/key_systems_cast.cc
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc
index be25c64491392a35455df94d2f43c06cc516f545..a07e6baabbe69d8520df743ee3c54522814625e4 100644
--- a/chromecast/renderer/key_systems_cast.cc
+++ b/chromecast/renderer/key_systems_cast.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "chromecast/media/base/key_systems_common.h"
#include "components/cdm/renderer/widevine_key_systems.h"
-#include "content/public/common/eme_constants.h"
+#include "media/base/eme_constants.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -19,17 +19,17 @@ namespace shell {
void AddKeySystemWithCodecs(
const std::string& key_system_name,
- std::vector<content::KeySystemInfo>* concrete_key_systems) {
- content::KeySystemInfo info(key_system_name);
- info.supported_codecs = content::EME_CODEC_MP4_ALL;
+ std::vector<media::KeySystemInfo>* concrete_key_systems) {
+ media::KeySystemInfo info(key_system_name);
+ info.supported_codecs = media::EME_CODEC_MP4_ALL;
concrete_key_systems->push_back(info);
}
void AddChromecastKeySystems(
- std::vector<content::KeySystemInfo>* key_systems_info) {
+ std::vector<media::KeySystemInfo>* key_systems_info) {
#if defined(WIDEVINE_CDM_AVAILABLE)
AddWidevineWithCodecs(cdm::WIDEVINE,
- content::EME_CODEC_MP4_ALL,
+ media::EME_CODEC_MP4_ALL,
key_systems_info);
#endif
« no previous file with comments | « chromecast/renderer/key_systems_cast.h ('k') | components/cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698