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

Unified Diff: media/blink/webmediasource_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: More Android fixes 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
Index: media/blink/webmediasource_impl.h
diff --git a/content/renderer/media/webmediasource_impl.h b/media/blink/webmediasource_impl.h
similarity index 70%
rename from content/renderer/media/webmediasource_impl.h
rename to media/blink/webmediasource_impl.h
index c788a663079e714d6188d3fbe97b3796b3c79e3b..a12c8c03703194488371c3c9763f48e2f8780d02 100644
--- a/content/renderer/media/webmediasource_impl.h
+++ b/media/blink/webmediasource_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_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>
@@ -13,13 +13,10 @@
namespace media {
class ChunkDemuxer;
-}
-
-namespace content {
class 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 +30,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_

Powered by Google App Engine
This is Rietveld 408576698