diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 02:05:24 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 02:05:24 +0000 |
| commit | a1e5299c58cf02899263f583a01cfbb91b21b17c (patch) | |
| tree | 6f77a67a6fa346fec740af09119e0d542d174f03 /net | |
| parent | d7d445a899d59a295e9c5b7bb2acd3854b011c31 (diff) | |
| download | chromium_src-a1e5299c58cf02899263f583a01cfbb91b21b17c.zip chromium_src-a1e5299c58cf02899263f583a01cfbb91b21b17c.tar.gz chromium_src-a1e5299c58cf02899263f583a01cfbb91b21b17c.tar.bz2 | |
OGG and OGV added to supported media types for omnibox, href and command line.
Review URL: http://codereview.chromium.org/149228
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 7667a94..0113e3d 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -66,6 +66,11 @@ static const MimeInfo primary_mappings[] = { { "image/gif", "gif" }, { "image/jpeg", "jpeg,jpg" }, { "image/png", "png" }, + { "video/mp4", "mp4,m4v" }, + { "audio/x-m4a", "m4a" }, + { "audio/mp3", "mp3" }, + { "video/ogg", "ogv,ogm" }, + { "audio/ogg", "ogg,oga" }, { "application/xhtml+xml", "xhtml,xht" } }; @@ -168,30 +173,23 @@ static const char* const supported_image_types[] = { "image/x-xbitmap" // xbm }; -// TODO(hclam): Integrate this list with |secondary_mappings| above. +// A list of media types: http://en.wikipedia.org/wiki/Internet_media_type +// A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php + static const char* const supported_media_types[] = { // Ogg. - "audio/ogg", "video/ogg", + "audio/ogg", // MPEG-4. - "application/mp4", - "audio/mp4", - "audio/x-m4a", "video/mp4", "video/x-m4v", + "audio/mp4", + "audio/x-m4a", // MP3. - // TODO(hclam): may add "audio/mpeg" and "audio/x-mp3". "audio/mp3", - - // AAC. - "audio/aac", - "audio/x-aac" - - // Generic MPEG mime-types. - "audio/mpeg", - "video/mpeg" + "audio/x-mp3", }; // Note: does not include javascript types list (see supported_javascript_types) |