diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 05:21:42 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 05:21:42 +0000 |
| commit | 1d494fbbb7b71676fc3a2f101ee6e52cfe42f0e9 (patch) | |
| tree | 01d6866847a77aed5d2f9018fecc3a17e3584a7b /net/base | |
| parent | 78d63c2de35000adda044aa03691028e02b1cbae (diff) | |
| download | chromium_src-1d494fbbb7b71676fc3a2f101ee6e52cfe42f0e9.zip chromium_src-1d494fbbb7b71676fc3a2f101ee6e52cfe42f0e9.tar.gz chromium_src-1d494fbbb7b71676fc3a2f101ee6e52cfe42f0e9.tar.bz2 | |
Promoting the MHTML file extension to primary mappings.
This CL promotes the MHTML file extensions to the MIME primary mappings.
This is to to make MHTML work on Windows.
Windows associates the message/rfc822 MIME type with MHTML files, and
we use the less mail specific multipart/related on the WebKit side.
BUG=83833
TEST=MHTML layout tests should pass on Windows.
Review URL: http://codereview.chromium.org/7077014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/mime_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 1ff023d..6c50354 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -95,7 +95,8 @@ static const MimeInfo primary_mappings[] = { { "audio/webm", "webm" }, { "audio/wav", "wav" }, { "application/xhtml+xml", "xhtml,xht" }, - { "application/x-chrome-extension", "crx" } + { "application/x-chrome-extension", "crx" }, + { "multipart/related", "mhtml,mht" } }; static const MimeInfo secondary_mappings[] = { @@ -117,8 +118,7 @@ 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" }, - { "multipart/related", "mht,mhtml" } + { "application/x-shockwave-flash", "swf,swl" } }; static const char* FindMimeType(const MimeInfo* mappings, |