summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 05:13:57 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 05:13:57 +0000
commitcdc263cb4c0e4627d49a7e59c36d583b73381fa9 (patch)
treeb70594ccf197c5728ce1076e83929664e8ddc3c5 /net
parent9dde6dcd9f130b9e2b2fccd236e4a98efbc2775c (diff)
downloadchromium_src-cdc263cb4c0e4627d49a7e59c36d583b73381fa9.zip
chromium_src-cdc263cb4c0e4627d49a7e59c36d583b73381fa9.tar.gz
chromium_src-cdc263cb4c0e4627d49a7e59c36d583b73381fa9.tar.bz2
Try one more time to lock down content sniffing for
Chrome extensions. Last time I tried to check this in, I had to roll it back because it made installing extensions from file:// URLs not work. Turned out that we just have to add a single line mapping the ".crx" extension to our mimetype. BUG=13296 TEST=Install an extension from the interweb, it should install. Install an extension from disk, it should install. Review URL: http://codereview.chromium.org/174380 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/mime_util.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 7951177..22e8eea 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -77,7 +77,8 @@ static const MimeInfo primary_mappings[] = {
{ "audio/mp3", "mp3" },
{ "video/ogg", "ogv,ogm" },
{ "audio/ogg", "ogg,oga" },
- { "application/xhtml+xml", "xhtml,xht" }
+ { "application/xhtml+xml", "xhtml,xht" },
+ { "application/x-chrome-extension", "crx" }
};
static const MimeInfo secondary_mappings[] = {