From 07ecfeec1678bde98e95b9fb3d65ef08218c471a Mon Sep 17 00:00:00 2001 From: gunsch Date: Tue, 28 Oct 2014 12:15:20 -0700 Subject: 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} --- chromecast/renderer/cast_content_renderer_client.cc | 2 +- chromecast/renderer/cast_content_renderer_client.h | 2 +- chromecast/renderer/key_systems_cast.cc | 10 +++++----- chromecast/renderer/key_systems_cast.h | 6 +++--- chromecast/renderer/key_systems_cast_simple.cc | 2 +- 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* 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* 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* 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* 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* concrete_key_systems); + std::vector< ::media::KeySystemInfo>* concrete_key_systems); void AddChromecastKeySystems( - std::vector* key_systems_info); + std::vector< ::media::KeySystemInfo>* key_systems_info); // TODO(gunsch): Remove when prefixed EME is removed. void AddChromecastPlatformKeySystems( - std::vector* 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* key_systems_info) { + std::vector< ::media::KeySystemInfo>* key_systems_info) { // Intentional no-op for public build. } -- cgit v1.1