diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 02:27:35 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 02:27:35 +0000 |
| commit | cb9242bbb167960e872bb12efbecb93610d43350 (patch) | |
| tree | 28f8d3c2901e39aa1505dcb05232ef3089ce0dc9 /net | |
| parent | 7061b12b4c63e24a7a3f3cf24c70a00f971cec31 (diff) | |
| download | chromium_src-cb9242bbb167960e872bb12efbecb93610d43350.zip chromium_src-cb9242bbb167960e872bb12efbecb93610d43350.tar.gz chromium_src-cb9242bbb167960e872bb12efbecb93610d43350.tar.bz2 | |
mp4 types in omnibox only for chrome, not chromium
The types are still claimed as supported because layout tests require them, but the extensions will not map to mimetypes, so typing them into the omnibox will download instead of trying to play the video.
The fixes for canPlayType that kyle is doing will fix some of this, and we'll also need to update the media in the layouttests. So that portion of mimetype will be deferred
BUG=17323
TEST=in the omni box type in the name of an mp4 and it should work in chrome, but not in chromium.
Review URL: http://codereview.chromium.org/155835
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 6be08d5..4cbb94d 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -69,9 +69,11 @@ static const MimeInfo primary_mappings[] = { { "image/gif", "gif" }, { "image/jpeg", "jpeg,jpg" }, { "image/png", "png" }, +#if defined(GOOGLE_CHROME_BUILD) { "video/mp4", "mp4,m4v" }, { "audio/x-m4a", "m4a" }, { "audio/mp3", "mp3" }, +#endif { "video/ogg", "ogv,ogm" }, { "audio/ogg", "ogg,oga" }, { "application/xhtml+xml", "xhtml,xht" } @@ -184,6 +186,7 @@ static const char* const supported_media_types[] = { "video/ogg", "audio/ogg", + // TODO(fbarchard): Remove these for Chromium when layout tests dont use mp4 // MPEG-4. "video/mp4", "video/x-m4v", |