Index: content/public/renderer/content_renderer_client.h |
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h |
index 073d0af28f6cd4087403575e2895d5fa80afe95b..5b3157412ea418917736d9bcba4cf13b783bcff7 100644 |
--- a/content/public/renderer/content_renderer_client.h |
+++ b/content/public/renderer/content_renderer_client.h |
@@ -31,7 +31,6 @@ class WebFrame; |
class WebHyphenator; |
class WebMIDIAccessor; |
class WebMIDIAccessorClient; |
-class WebMediaPlayerClient; |
class WebMediaStreamCenter; |
class WebMediaStreamCenterClient; |
class WebPlugin; |
@@ -55,9 +54,8 @@ struct WebPluginInfo; |
} |
namespace webkit_media { |
-class WebMediaPlayerDelegate; |
-class WebMediaPlayerImpl; |
-class WebMediaPlayerParams; |
+class MediaLoadDelegate; |
+class MediaStreamClient; |
} |
namespace content { |
@@ -126,14 +124,11 @@ class CONTENT_EXPORT ContentRendererClient { |
std::string* error_html, |
string16* error_description) {} |
- // Allows embedder to override creating a WebMediaPlayerImpl. If it returns |
- // NULL the content layer will create the media player. |
- virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( |
- RenderView* render_view, |
- WebKit::WebFrame* frame, |
- WebKit::WebMediaPlayerClient* client, |
- base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
- const webkit_media::WebMediaPlayerParams& params); |
+ // Allows the embedder to control when media resources are loaded. If it |
+ // returns NULL no delegate will be used and media resources will always |
+ // be loaded. |
+ virtual webkit_media::MediaLoadDelegate* OverrideCreateMediaLoadDelegate( |
jam
2013/06/28 21:59:40
nit: rename to reflect that it's a delegate. the c
ddorwin
2013/06/29 01:38:30
nit: Is there always a delegate or does this optio
scherkus (not reviewing)
2013/07/02 01:46:23
Done.
|
+ RenderView* render_view); |
// Allows the embedder to override creating a WebMediaStreamCenter. If it |
// returns NULL the content layer will create the stream center. |
@@ -146,6 +141,10 @@ class CONTENT_EXPORT ContentRendererClient { |
OverrideCreateWebRTCPeerConnectionHandler( |
WebKit::WebRTCPeerConnectionHandlerClient* client); |
+ // Allows the embedder to override creating a MediaStreamClient. If it returns |
+ // NULL the content layer will create the media stream client. |
+ virtual webkit_media::MediaStreamClient* OverrideCreateMediaStreamClient(); |
jam
2013/06/28 21:59:40
I don't see this being called?
scherkus (not reviewing)
2013/07/02 01:46:23
Whoops! Got left out of my reduced CL.
|
+ |
// Allows the embedder to override creating a WebMIDIAccessor. If it |
// returns NULL the content layer will create the MIDI accessor. |
virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor( |