diff options
| author | xhwang <xhwang@chromium.org> | 2014-10-23 17:03:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 00:03:45 +0000 |
| commit | 1c03e830f2ab2d83e2bdc96cb399d2a43c77f576 (patch) | |
| tree | 7f2f7f517e6e05299df6947cc074359b7ed40ade /chromecast/renderer | |
| parent | 9448dfa74ccf2ecbe7aa8be87701d5fc9fedf215 (diff) | |
| download | chromium_src-1c03e830f2ab2d83e2bdc96cb399d2a43c77f576.zip chromium_src-1c03e830f2ab2d83e2bdc96cb399d2a43c77f576.tar.gz chromium_src-1c03e830f2ab2d83e2bdc96cb399d2a43c77f576.tar.bz2 | |
Move KeySystemInfo to media/.
This is a preparation to move KeySystems to media, which is needed to support
Encrypted Media Extensions (EME) without relying on content.
BUG=422730
Review URL: https://codereview.chromium.org/665343002
Cr-Commit-Position: refs/heads/master@{#300992}
Diffstat (limited to 'chromecast/renderer')
| -rw-r--r-- | chromecast/renderer/DEPS | 1 | ||||
| -rw-r--r-- | chromecast/renderer/key_systems_cast.cc | 12 | ||||
| -rw-r--r-- | chromecast/renderer/key_systems_cast.h | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/chromecast/renderer/DEPS b/chromecast/renderer/DEPS index 8632b54..790b870 100644 --- a/chromecast/renderer/DEPS +++ b/chromecast/renderer/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+chromecast/media", "+components/cdm/renderer", "+content/public/renderer", + "+media/base", "+third_party/WebKit/public/platform", "+third_party/WebKit/public/web", ] diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc index be25c64..a07e6ba 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 diff --git a/chromecast/renderer/key_systems_cast.h b/chromecast/renderer/key_systems_cast.h index 5853c68..544876b 100644 --- a/chromecast/renderer/key_systems_cast.h +++ b/chromecast/renderer/key_systems_cast.h @@ -7,7 +7,7 @@ #include <vector> -#include "content/public/renderer/key_system_info.h" +#include "media/base/key_system_info.h" namespace chromecast { namespace shell { @@ -15,14 +15,14 @@ namespace shell { // Adds a single key system by name. void AddKeySystemWithCodecs( const std::string& key_system_name, - std::vector<content::KeySystemInfo>* concrete_key_systems); + std::vector<media::KeySystemInfo>* concrete_key_systems); void AddChromecastKeySystems( - std::vector<content::KeySystemInfo>* key_systems_info); + std::vector<media::KeySystemInfo>* key_systems_info); // TODO(gunsch): Remove when prefixed EME is removed. void AddChromecastPlatformKeySystems( - std::vector<content::KeySystemInfo>* key_systems_info); + std::vector<media::KeySystemInfo>* key_systems_info); } // namespace shell } // namespace chromecast |