summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authoracolwell <acolwell@chromium.org>2014-09-06 12:01:32 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-06 19:06:46 +0000
commit9e0840d0672da96350a1f33d684f2c64d2574f46 (patch)
tree6d72e3d50fcfd66f70a58c5d3583358055de4d9a /media/base
parent87a3ebac6b26918b151151efed3311d0ddc20d73 (diff)
downloadchromium_src-9e0840d0672da96350a1f33d684f2c64d2574f46.zip
chromium_src-9e0840d0672da96350a1f33d684f2c64d2574f46.tar.gz
chromium_src-9e0840d0672da96350a1f33d684f2c64d2574f46.tar.bz2
Move WebMediaPlayerImpl and its dependencies to media/blink.
Moving WebMediaPlayerImpl and related classes in content/renderer/media to media/blink so that they can be reused by Mojo code. BUG=408338 Review URL: https://codereview.chromium.org/495353003 Cr-Commit-Position: refs/heads/master@{#293628}
Diffstat (limited to 'media/base')
-rw-r--r--media/base/data_source.cc3
-rw-r--r--media/base/data_source.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/media/base/data_source.cc b/media/base/data_source.cc
index c8ab446..b6999c2 100644
--- a/media/base/data_source.cc
+++ b/media/base/data_source.cc
@@ -8,9 +8,6 @@
namespace media {
-// static
-const int DataSource::kReadError = -1;
-
DataSource::DataSource() {}
DataSource::~DataSource() {}
diff --git a/media/base/data_source.h b/media/base/data_source.h
index e0b7373..42566a9 100644
--- a/media/base/data_source.h
+++ b/media/base/data_source.h
@@ -15,7 +15,8 @@ class MEDIA_EXPORT DataSource {
public:
typedef base::Callback<void(int64, int64)> StatusCallback;
typedef base::Callback<void(int)> ReadCB;
- static const int kReadError;
+
+ enum { kReadError = -1 };
DataSource();
virtual ~DataSource();