Chromium Code Reviews| Index: content/browser/media/android/media_player_renderer.cc |
| diff --git a/content/browser/media/android/media_player_renderer.cc b/content/browser/media/android/media_player_renderer.cc |
| index 58d7bfa80db3b9234d48c3883738f18efd989b67..4bc9b79bed4d56fa363c864efd2d490afc92a45a 100644 |
| --- a/content/browser/media/android/media_player_renderer.cc |
| +++ b/content/browser/media/android/media_player_renderer.cc |
| @@ -21,6 +21,8 @@ constexpr int kUnusedAndIrrelevantPlayerId = 0; |
| namespace content { |
| +static media::MediaUrlInterceptor* media_url_interceptor_ = nullptr; |
|
watk
2016/10/28 22:34:48
This should have the g_ prefix (for global). And I
|
| + |
| MediaPlayerRenderer::MediaPlayerRenderer(RenderFrameHost* render_frame_host) |
| : render_frame_host_(render_frame_host), |
| has_error_(false), |
| @@ -163,9 +165,7 @@ media::MediaResourceGetter* MediaPlayerRenderer::GetMediaResourceGetter() { |
| } |
| media::MediaUrlInterceptor* MediaPlayerRenderer::GetMediaUrlInterceptor() { |
| - // TODO(tguilbert): Offer a RegisterMediaUrlInterceptor equivalent for use in |
| - // webview. See crbug.com/636588. |
| - return nullptr; |
| + return media_url_interceptor_; |
| } |
| void MediaPlayerRenderer::OnTimeUpdate(int player_id, |
| @@ -242,6 +242,12 @@ void MediaPlayerRenderer::OnDecoderResourcesReleased(int player_id) { |
| // See crbug.com/636615. |
| } |
| +// static |
| +void MediaPlayerRenderer::RegisterMediaUrlInterceptor( |
| + media::MediaUrlInterceptor* media_url_interceptor) { |
| + media_url_interceptor_ = media_url_interceptor; |
| +} |
| + |
| void MediaPlayerRenderer::CancelScopedSurfaceRequest() { |
| if (!surface_request_token_) |
| return; |