diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:48:22 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:48:22 +0000 |
| commit | 45566b5593cfc9b5d20990cb30cea47d8e3cfd04 (patch) | |
| tree | 92136d379ab0d239f246f6fadfd02dbd05f60a20 /net/base | |
| parent | 882b8b8123cadfe690eb1707b40460b30c3d691d (diff) | |
| download | chromium_src-45566b5593cfc9b5d20990cb30cea47d8e3cfd04.zip chromium_src-45566b5593cfc9b5d20990cb30cea47d8e3cfd04.tar.gz chromium_src-45566b5593cfc9b5d20990cb30cea47d8e3cfd04.tar.bz2 | |
Add webp mime type for omnibox
BUG=61488
TEST=d:\mediatests\still.webp
Review URL: http://codereview.chromium.org/4232003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/mime_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index a580997..ddcfc4b 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -82,6 +82,7 @@ static const MimeInfo primary_mappings[] = { { "text/xml", "xml" }, { "image/gif", "gif" }, { "image/jpeg", "jpeg,jpg" }, + { "image/webp", "webp" }, { "image/png", "png" }, { "video/mp4", "mp4,m4v" }, { "audio/x-m4a", "m4a" }, @@ -192,6 +193,7 @@ static const char* const supported_image_types[] = { "image/jpeg", "image/pjpeg", "image/jpg", + "image/webp", "image/png", "image/gif", "image/bmp", @@ -547,6 +549,7 @@ static const char* kStandardImageTypes[] = { "image/gif", "image/ief", "image/jpeg", + "image/webp", "image/pict", "image/pipeg", "image/png", @@ -660,7 +663,6 @@ void HashSetToVector(base::hash_set<T>* source, std::vector<T>* target) { target->at(old_target_size + i) = *iter; } } - } void GetImageExtensions(std::vector<FilePath::StringType>* extensions) { |