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

Unified Diff: webkit/media/buffered_data_source.cc

Issue 8570010: Moving media-related files from webkit/glue/ to webkit/media/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: minor fixes Created 9 years, 1 month 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 | « webkit/media/buffered_data_source.h ('k') | webkit/media/buffered_data_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/buffered_data_source.cc
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
similarity index 99%
rename from webkit/glue/media/buffered_data_source.cc
rename to webkit/media/buffered_data_source.cc
index a3f43cf5d2bb218d092bfcb8f9b73a0c512215db..01d4675b206c74d448e1e5fe7a3ef4c9c228bf99 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/glue/media/buffered_data_source.h"
+#include "webkit/media/buffered_data_source.h"
#include "base/bind.h"
#include "media/base/filter_host.h"
#include "media/base/media_log.h"
#include "net/base/net_errors.h"
-#include "webkit/glue/media/web_data_source_factory.h"
+#include "webkit/media/web_data_source_factory.h"
#include "webkit/glue/webkit_glue.h"
using WebKit::WebFrame;
-namespace webkit_glue {
+namespace webkit_media {
// BufferedDataSource has an intermediate buffer, this value governs the initial
// size of that buffer. It is set to 32KB because this is a typical read size
@@ -105,7 +105,7 @@ void BufferedDataSource::Initialize(const std::string& url,
if (url_.SchemeIs(kDataScheme)) {
callback.Run(media::DATASOURCE_ERROR_URL_NOT_SUPPORTED);
return;
- } else if (!IsProtocolSupportedForMedia(url_)) {
+ } else if (!webkit_glue::IsProtocolSupportedForMedia(url_)) {
callback.Run(media::PIPELINE_ERROR_NETWORK);
return;
}
@@ -669,4 +669,4 @@ void BufferedDataSource::UpdateHostState_Locked() {
}
}
-} // namespace webkit_glue
+} // namespace webkit_media
« no previous file with comments | « webkit/media/buffered_data_source.h ('k') | webkit/media/buffered_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698