| Index: media/blink/webmediasource_impl.h
|
| diff --git a/content/renderer/media/webmediasource_impl.h b/media/blink/webmediasource_impl.h
|
| similarity index 65%
|
| rename from content/renderer/media/webmediasource_impl.h
|
| rename to media/blink/webmediasource_impl.h
|
| index c788a663079e714d6188d3fbe97b3796b3c79e3b..bda2cba91be0e288f87807c7eb1e85e346e7ca5e 100644
|
| --- a/content/renderer/media/webmediasource_impl.h
|
| +++ b/media/blink/webmediasource_impl.h
|
| @@ -2,24 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIASOURCE_IMPL_H_
|
| -#define CONTENT_RENDERER_MEDIA_WEBMEDIASOURCE_IMPL_H_
|
| +#ifndef MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
|
| +#define MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "media/base/media_export.h"
|
| #include "media/base/media_log.h"
|
| #include "third_party/WebKit/public/platform/WebMediaSource.h"
|
|
|
| namespace media {
|
| class ChunkDemuxer;
|
| -}
|
|
|
| -namespace content {
|
| -
|
| -class WebMediaSourceImpl : public blink::WebMediaSource {
|
| +class MEDIA_EXPORT WebMediaSourceImpl : public blink::WebMediaSource {
|
| public:
|
| - WebMediaSourceImpl(media::ChunkDemuxer* demuxer, media::LogCB log_cb);
|
| + WebMediaSourceImpl(ChunkDemuxer* demuxer, LogCB log_cb);
|
| virtual ~WebMediaSourceImpl();
|
|
|
| // blink::WebMediaSource implementation.
|
| @@ -33,12 +31,12 @@ class WebMediaSourceImpl : public blink::WebMediaSource {
|
| virtual void unmarkEndOfStream();
|
|
|
| private:
|
| - media::ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
|
| - media::LogCB log_cb_;
|
| + ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
|
| + LogCB log_cb_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_RENDERER_MEDIA_WEBMEDIASOURCE_IMPL_H_
|
| +#endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
|
|
|