Chromium Code Reviews| Index: content/renderer/render_view.cc |
| diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
| index 02d3cf26520278a392abfc310a10c485d47cd1d3..3800c6b11405421794af88872d73b3d2b7be54bb 100644 |
| --- a/content/renderer/render_view.cc |
| +++ b/content/renderer/render_view.cc |
| @@ -1909,12 +1909,21 @@ WebMediaPlayer* RenderView::createMediaPlayer( |
| collection->AddVideoRenderer(renderer); |
| video_renderer = renderer; |
| - scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
| - new webkit_glue::WebMediaPlayerImpl(client, |
| - collection.release(), |
| - message_loop_factory.release(), |
| - media_stream_impl_.get(), |
| - new RenderMediaLog())); |
| + scoped_ptr<webkit_glue::WebMediaPlayerImpl> result; |
| + if (content::GetContentClient()->renderer() |
| + ->ShouldOverrideCreateWebMediaPlayer(this)) { |
| + webkit_glue::WebMediaPlayerImpl* result_ptr; |
| + content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| + this, client, collection.release(), message_loop_factory.release(), |
| + media_stream_impl_.get(), new RenderMediaLog(), &result_ptr); |
| + result.reset(result_ptr); |
| + } else { |
| + result.reset(new webkit_glue::WebMediaPlayerImpl(client, |
| + collection.release(), message_loop_factory.release(), |
| + media_stream_impl_.get(), new RenderMediaLog())); |
| + } |
| + DCHECK(result.get()); |
|
scherkus (not reviewing)
2011/10/03 18:19:45
should'nt this DCHECK go inside the ShouldOverride
Shishir
2011/10/04 23:02:39
Done.
|
| + |
| if (!result->Initialize(frame, |
| cmd_line->HasSwitch(switches::kSimpleDataSource), |
| video_renderer)) { |