Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: net/base/mime_util.cc

Issue 10079012: Change resource handling policy to allow feed types to download so they can be handled by web inten… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/buffered_resource_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "net/base/mime_util.h" 8 #include "net/base/mime_util.h"
9 #include "net/base/platform_mime_util.h" 9 #include "net/base/platform_mime_util.h"
10 10
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // download instead of displaying in the browser: 298 // download instead of displaying in the browser:
299 // http://code.google.com/p/chromium/issues/detail?id=7192 299 // http://code.google.com/p/chromium/issues/detail?id=7192
300 // So, by including "text/css" into this list we choose Firefox 300 // So, by including "text/css" into this list we choose Firefox
301 // behavior - css files will be displayed: 301 // behavior - css files will be displayed:
302 "text/css", 302 "text/css",
303 "text/vnd.chromium.ftp-dir", 303 "text/vnd.chromium.ftp-dir",
304 "text/", 304 "text/",
305 "image/svg+xml", // SVG is text-based XML, even though it has an image/ type 305 "image/svg+xml", // SVG is text-based XML, even though it has an image/ type
306 "application/xml", 306 "application/xml",
307 "application/xhtml+xml", 307 "application/xhtml+xml",
308 "application/rss+xml",
309 "application/atom+xml",
310 "application/json", 308 "application/json",
311 "application/x-x509-user-cert", 309 "application/x-x509-user-cert",
312 "multipart/related", // For MHTML support. 310 "multipart/related", // For MHTML support.
313 "multipart/x-mixed-replace" 311 "multipart/x-mixed-replace"
314 // Note: ADDING a new type here will probably render it AS HTML. This can 312 // Note: ADDING a new type here will probably render it AS HTML. This can
315 // result in cross site scripting. 313 // result in cross site scripting.
316 }; 314 };
317 315
318 // Mozilla 1.8 and WinIE 7 both accept text/javascript and text/ecmascript. 316 // Mozilla 1.8 and WinIE 7 both accept text/javascript and text/ecmascript.
319 // Mozilla 1.8 accepts application/javascript, application/ecmascript, and 317 // Mozilla 1.8 accepts application/javascript, application/ecmascript, and
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 // Unless/until WebM files are added to the media layout tests, we need to avoid 781 // Unless/until WebM files are added to the media layout tests, we need to avoid
784 // blacklisting mp4 and H.264 when Theora is not supported (and proprietary 782 // blacklisting mp4 and H.264 when Theora is not supported (and proprietary
785 // codecs are) so that the media tests can still run. 783 // codecs are) so that the media tests can still run.
786 #if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS) 784 #if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
787 for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i) 785 for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i)
788 codecs->push_back(proprietary_media_codecs[i]); 786 codecs->push_back(proprietary_media_codecs[i]);
789 #endif 787 #endif
790 } 788 }
791 789
792 } // namespace net 790 } // namespace net
OLDNEW
« no previous file with comments | « content/browser/renderer_host/buffered_resource_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698