diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-12 14:20:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-12 14:20:17 +0100 |
| commit | ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 (patch) | |
| tree | aa3b1013e823cb7bdee9ece936928292f57b31f4 /media/filters/file_data_source.h | |
| parent | f7fa989080f1e63c6a8aa24d5434922d52d9f51e (diff) | |
| download | chromium_org-ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16.tar.gz | |
Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
Diffstat (limited to 'media/filters/file_data_source.h')
| -rw-r--r-- | media/filters/file_data_source.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h index e55ecdf021..c0164dac57 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/platform_file.h" #include "media/base/data_source.h" namespace media { @@ -21,6 +22,7 @@ class MEDIA_EXPORT FileDataSource : public DataSource { virtual ~FileDataSource(); bool Initialize(const base::FilePath& file_path); + bool InitializeFromPlatformFile(const base::PlatformFile& file); // Implementation of DataSource. virtual void set_host(DataSourceHost* host) OVERRIDE; |