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

Unified Diff: content/renderer/media/buffered_data_source.h

Issue 18261007: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win64 AGAIN Created 7 years, 5 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 | « content/renderer/media/audio_decoder.cc ('k') | content/renderer/media/buffered_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/buffered_data_source.h
diff --git a/webkit/renderer/media/buffered_data_source.h b/content/renderer/media/buffered_data_source.h
similarity index 94%
rename from webkit/renderer/media/buffered_data_source.h
rename to content/renderer/media/buffered_data_source.h
index 15072dcf25769b88a2872d128ef400e1f8c25b0b..da451ba9a73e52b20866a30760fde51c3a1d20d3 100644
--- a/webkit/renderer/media/buffered_data_source.h
+++ b/content/renderer/media/buffered_data_source.h
@@ -2,19 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
-#define WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
+#ifndef CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
+#define CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
#include <string>
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
+#include "content/common/content_export.h"
+#include "content/renderer/media/buffered_resource_loader.h"
+#include "content/renderer/media/preload.h"
#include "media/base/data_source.h"
#include "media/base/ranges.h"
#include "url/gurl.h"
-#include "webkit/renderer/media/buffered_resource_loader.h"
-#include "webkit/renderer/media/preload.h"
namespace base {
class MessageLoopProxy;
@@ -24,14 +25,14 @@ namespace media {
class MediaLog;
}
-namespace webkit_media {
+namespace content {
// A data source capable of loading URLs and buffering the data using an
// in-memory sliding window.
//
// BufferedDataSource must be created and initialized on the render thread
// before being passed to other threads. It may be deleted on any thread.
-class BufferedDataSource : public media::DataSource {
+class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
public:
typedef base::Callback<void(bool)> DownloadingCB;
@@ -215,6 +216,6 @@ class BufferedDataSource : public media::DataSource {
DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
};
-} // namespace webkit_media
+} // namespace content
-#endif // WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
+#endif // CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
« no previous file with comments | « content/renderer/media/audio_decoder.cc ('k') | content/renderer/media/buffered_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698