summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-03 03:58:12 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-03 03:58:12 +0000
commit943cffb3f931a205721080f1f3fbcddfb05a936b (patch)
treecbe60abaf6770565363d155762f81c5194ee36b6 /webkit
parentadcfed4259fbe4295d172889955b1ba5b4ce7c85 (diff)
downloadchromium_src-943cffb3f931a205721080f1f3fbcddfb05a936b.zip
chromium_src-943cffb3f931a205721080f1f3fbcddfb05a936b.tar.gz
chromium_src-943cffb3f931a205721080f1f3fbcddfb05a936b.tar.bz2
Add common video formats to the media galleries extension filter.
BUG=159226 Review URL: https://chromiumcodereview.appspot.com/11359049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/media/media_path_filter.cc17
1 files changed, 17 insertions, 0 deletions
diff --git a/webkit/fileapi/media/media_path_filter.cc b/webkit/fileapi/media/media_path_filter.cc
index 0045089..ae92c19 100644
--- a/webkit/fileapi/media/media_path_filter.cc
+++ b/webkit/fileapi/media/media_path_filter.cc
@@ -14,6 +14,19 @@ namespace fileapi {
namespace {
+const FilePath::CharType* const kExtraSupportedExtensions[] = {
+ FILE_PATH_LITERAL("3gp"),
+ FILE_PATH_LITERAL("3gpp"),
+ FILE_PATH_LITERAL("avi"),
+ FILE_PATH_LITERAL("flv"),
+ FILE_PATH_LITERAL("mov"),
+ FILE_PATH_LITERAL("mpeg"),
+ FILE_PATH_LITERAL("mpeg4"),
+ FILE_PATH_LITERAL("mpegps"),
+ FILE_PATH_LITERAL("mpg"),
+ FILE_PATH_LITERAL("wmv"),
+};
+
bool IsUnsupportedExtension(const FilePath::StringType& extension) {
std::string mime_type;
return !net::GetMimeTypeFromExtension(extension, &mime_type) ||
@@ -54,6 +67,10 @@ void MediaPathFilter::EnsureInitialized() {
&IsUnsupportedExtension);
media_file_extensions_.erase(new_end, media_file_extensions_.end());
+ // Add other common extensions.
+ for (size_t i = 0; i < arraysize(kExtraSupportedExtensions); ++i)
+ media_file_extensions_.push_back(kExtraSupportedExtensions[i]);
+
for (MediaFileExtensionList::iterator itr = media_file_extensions_.begin();
itr != media_file_extensions_.end(); ++itr)
*itr = FilePath::kExtensionSeparator + *itr;