Chromium Code Reviews| Index: net/base/mime_util.cc |
| diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc |
| index 51bf9643a3641ba24d0436e2ef04781f820ebf9e..b6aa539429798ce5645c0950c90188f88b79e733 100644 |
| --- a/net/base/mime_util.cc |
| +++ b/net/base/mime_util.cc |
| @@ -117,7 +117,8 @@ static const MimeInfo secondary_mappings[] = { |
| { "application/rdf+xml", "rdf" }, |
| { "text/xml", "xsl,xbl" }, |
| { "application/vnd.mozilla.xul+xml", "xul" }, |
| - { "application/x-shockwave-flash", "swf,swl" } |
| + { "application/x-shockwave-flash", "swf,swl" }, |
| + { "multipart/related", "mht,mhtml" } |
| }; |
| static const char* FindMimeType(const MimeInfo* mappings, |
| @@ -266,12 +267,13 @@ static const char* const supported_non_image_types[] = { |
| "application/atom+xml", |
| "application/json", |
| "application/x-x509-user-cert", |
| + "multipart/related", // For MHTML support. |
| "multipart/x-mixed-replace" |
| // Note: ADDING a new type here will probably render it AS HTML. This can |
| // result in cross site scripting. |
| }; |
| -COMPILE_ASSERT(arraysize(supported_non_image_types) == 16, |
| - supported_non_images_types_must_equal_16); |
| +COMPILE_ASSERT(arraysize(supported_non_image_types) == 17, |
| + supported_non_images_types_must_equal_17); |
|
wtc
2011/05/25 00:31:49
This COMPILE_ASSERT probably should be removed. A
|
| // Mozilla 1.8 and WinIE 7 both accept text/javascript and text/ecmascript. |
| // Mozilla 1.8 accepts application/javascript, application/ecmascript, and |