summaryrefslogtreecommitdiffstats
path: root/net/base/mime_util.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:32:57 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:32:57 +0000
commit269a4ccc9ac806f5cf95603e4bd93c1d63bfb415 (patch)
treec1f6a8b0f5dc32971eb7c6e5a4a55739cb814183 /net/base/mime_util.cc
parent1a5e108aa56aeb77380965efa5c682d388242e87 (diff)
downloadchromium_src-269a4ccc9ac806f5cf95603e4bd93c1d63bfb415.zip
chromium_src-269a4ccc9ac806f5cf95603e4bd93c1d63bfb415.tar.gz
chromium_src-269a4ccc9ac806f5cf95603e4bd93c1d63bfb415.tar.bz2
Display application/json files inline.
BUG=27884 TEST=see bug. Review URL: http://codereview.chromium.org/385148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
-rw-r--r--net/base/mime_util.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 83e41a9..cd56ab8 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -233,6 +233,7 @@ static const char* const supported_non_image_types[] = {
"application/xhtml+xml",
"application/rss+xml",
"application/atom+xml",
+ "application/json",
"application/x-x509-user-cert",
"multipart/x-mixed-replace"
};