summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgunsch <gunsch@chromium.org>2014-10-28 12:15:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 19:15:39 +0000
commit07ecfeec1678bde98e95b9fb3d65ef08218c471a (patch)
tree5a13b8a4a5f1767c14c8f7914a8eb06a127f7a74
parent5d16ece519b7901d7c7530773815dca0a007abab (diff)
downloadchromium_src-07ecfeec1678bde98e95b9fb3d65ef08218c471a.zip
chromium_src-07ecfeec1678bde98e95b9fb3d65ef08218c471a.tar.gz
chromium_src-07ecfeec1678bde98e95b9fb3d65ef08218c471a.tar.bz2
Chromecast buildfix: content::KeySystemsInfo moved to media namespace.
R=xhwang@chromium.org,lcwu@chromium.org BUG=None Review URL: https://codereview.chromium.org/683893003 Cr-Commit-Position: refs/heads/master@{#301678}
-rw-r--r--chromecast/renderer/cast_content_renderer_client.cc2
-rw-r--r--chromecast/renderer/cast_content_renderer_client.h2
-rw-r--r--chromecast/renderer/key_systems_cast.cc10
-rw-r--r--chromecast/renderer/key_systems_cast.h6
-rw-r--r--chromecast/renderer/key_systems_cast_simple.cc2
5 files changed, 11 insertions, 11 deletions
diff --git a/chromecast/renderer/cast_content_renderer_client.cc b/chromecast/renderer/cast_content_renderer_client.cc
index 1e949ae..60f117b 100644
--- a/chromecast/renderer/cast_content_renderer_client.cc
+++ b/chromecast/renderer/cast_content_renderer_client.cc
@@ -49,7 +49,7 @@ void CastContentRendererClient::RenderViewCreated(
}
void CastContentRendererClient::AddKeySystems(
- std::vector<content::KeySystemInfo>* key_systems) {
+ std::vector< ::media::KeySystemInfo>* key_systems) {
AddChromecastKeySystems(key_systems);
AddChromecastPlatformKeySystems(key_systems);
}
diff --git a/chromecast/renderer/cast_content_renderer_client.h b/chromecast/renderer/cast_content_renderer_client.h
index 1b32841..e7d4654 100644
--- a/chromecast/renderer/cast_content_renderer_client.h
+++ b/chromecast/renderer/cast_content_renderer_client.h
@@ -19,7 +19,7 @@ class CastContentRendererClient : public content::ContentRendererClient {
virtual void RenderThreadStarted() override;
virtual void RenderViewCreated(content::RenderView* render_view) override;
virtual void AddKeySystems(
- std::vector<content::KeySystemInfo>* key_systems) override;
+ std::vector< ::media::KeySystemInfo>* key_systems) override;
};
} // namespace shell
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc
index a07e6ba..919ebbe 100644
--- a/chromecast/renderer/key_systems_cast.cc
+++ b/chromecast/renderer/key_systems_cast.cc
@@ -19,17 +19,17 @@ namespace shell {
void AddKeySystemWithCodecs(
const std::string& key_system_name,
- std::vector<media::KeySystemInfo>* concrete_key_systems) {
- media::KeySystemInfo info(key_system_name);
- info.supported_codecs = media::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<media::KeySystemInfo>* key_systems_info) {
+ std::vector< ::media::KeySystemInfo>* key_systems_info) {
#if defined(WIDEVINE_CDM_AVAILABLE)
AddWidevineWithCodecs(cdm::WIDEVINE,
- media::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 544876b..36b21d5 100644
--- a/chromecast/renderer/key_systems_cast.h
+++ b/chromecast/renderer/key_systems_cast.h
@@ -15,14 +15,14 @@ namespace shell {
// Adds a single key system by name.
void AddKeySystemWithCodecs(
const std::string& key_system_name,
- std::vector<media::KeySystemInfo>* concrete_key_systems);
+ std::vector< ::media::KeySystemInfo>* concrete_key_systems);
void AddChromecastKeySystems(
- std::vector<media::KeySystemInfo>* key_systems_info);
+ std::vector< ::media::KeySystemInfo>* key_systems_info);
// TODO(gunsch): Remove when prefixed EME is removed.
void AddChromecastPlatformKeySystems(
- std::vector<media::KeySystemInfo>* key_systems_info);
+ std::vector< ::media::KeySystemInfo>* key_systems_info);
} // namespace shell
} // namespace chromecast
diff --git a/chromecast/renderer/key_systems_cast_simple.cc b/chromecast/renderer/key_systems_cast_simple.cc
index 395c2b7..e5ca378 100644
--- a/chromecast/renderer/key_systems_cast_simple.cc
+++ b/chromecast/renderer/key_systems_cast_simple.cc
@@ -8,7 +8,7 @@ namespace chromecast {
namespace shell {
void AddChromecastPlatformKeySystems(
- std::vector<content::KeySystemInfo>* key_systems_info) {
+ std::vector< ::media::KeySystemInfo>* key_systems_info) {
// Intentional no-op for public build.
}