Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: media/blink/websourcebuffer_impl.h

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediasource_impl.cc ('k') | media/blink/websourcebuffer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/websourcebuffer_impl.h
diff --git a/content/renderer/media/websourcebuffer_impl.h b/media/blink/websourcebuffer_impl.h
similarity index 79%
rename from content/renderer/media/websourcebuffer_impl.h
rename to media/blink/websourcebuffer_impl.h
index b0e4fa686aed738299f5b320e49f1759a43c5343..e9381788adb30072419ce930c434b264e59d6db4 100644
--- a/content/renderer/media/websourcebuffer_impl.h
+++ b/media/blink/websourcebuffer_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
-#define CONTENT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
+#ifndef MEDIA_BLINK_WEBSOURCEBUFFER_IMPL_H_
+#define MEDIA_BLINK_WEBSOURCEBUFFER_IMPL_H_
#include <string>
@@ -14,13 +14,10 @@
namespace media {
class ChunkDemuxer;
-}
-
-namespace content {
class WebSourceBufferImpl : public blink::WebSourceBuffer {
public:
- WebSourceBufferImpl(const std::string& id, media::ChunkDemuxer* demuxer);
+ WebSourceBufferImpl(const std::string& id, ChunkDemuxer* demuxer);
virtual ~WebSourceBufferImpl();
// blink::WebSourceBuffer implementation.
@@ -39,7 +36,7 @@ class WebSourceBufferImpl : public blink::WebSourceBuffer {
private:
std::string id_;
- media::ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
+ ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
// Controls the offset applied to timestamps when processing appended media
// segments. It is initially 0, which indicates that no offset is being
@@ -52,6 +49,6 @@ class WebSourceBufferImpl : public blink::WebSourceBuffer {
DISALLOW_COPY_AND_ASSIGN(WebSourceBufferImpl);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
+#endif // MEDIA_BLINK_WEBSOURCEBUFFER_IMPL_H_
« no previous file with comments | « media/blink/webmediasource_impl.cc ('k') | media/blink/websourcebuffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698