| Index: content/renderer/media/webmediaplayer_ms.h
|
| diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
|
| index eea5c0376aeca22788697c273c830a7ace1d0325..eb67d3d1802f1f1cb8cd54ab64ae646c33f5a46c 100644
|
| --- a/content/renderer/media/webmediaplayer_ms.h
|
| +++ b/content/renderer/media/webmediaplayer_ms.h
|
| @@ -23,6 +23,7 @@ class WebMediaPlayerClient;
|
|
|
| namespace media {
|
| class MediaLog;
|
| +class WebMediaPlayerDelegate;
|
| }
|
|
|
| namespace cc_blink {
|
| @@ -33,7 +34,6 @@ namespace content {
|
| class MediaStreamAudioRenderer;
|
| class MediaStreamRendererFactory;
|
| class VideoFrameProvider;
|
| -class WebMediaPlayerDelegate;
|
|
|
| // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to
|
| // Chrome's media player when "src" is from media stream.
|
| @@ -58,7 +58,7 @@ class WebMediaPlayerMS
|
| // a MediaStreamClient which provides VideoFrameProvider.
|
| WebMediaPlayerMS(blink::WebFrame* frame,
|
| blink::WebMediaPlayerClient* client,
|
| - base::WeakPtr<WebMediaPlayerDelegate> delegate,
|
| + base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
|
| media::MediaLog* media_log,
|
| scoped_ptr<MediaStreamRendererFactory> factory);
|
| virtual ~WebMediaPlayerMS();
|
| @@ -155,7 +155,7 @@ class WebMediaPlayerMS
|
|
|
| blink::WebMediaPlayerClient* client_;
|
|
|
| - base::WeakPtr<WebMediaPlayerDelegate> delegate_;
|
| + base::WeakPtr<media::WebMediaPlayerDelegate> delegate_;
|
|
|
| // Specify content:: to disambiguate from cc::.
|
| scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
|
|
|