diff options
| author | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 01:18:24 +0000 |
|---|---|---|
| committer | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 01:18:24 +0000 |
| commit | 3366aca676e728c19d33c3d30f1cbfe38e11f27a (patch) | |
| tree | f58335f6367aada990f030c1661c92e1e4fc566c /chrome/browser/download | |
| parent | b15bc3e3d3c1aa31af7a772cc75dfdfe5f9c216e (diff) | |
| download | chromium_src-3366aca676e728c19d33c3d30f1cbfe38e11f27a.zip chromium_src-3366aca676e728c19d33c3d30f1cbfe38e11f27a.tar.gz chromium_src-3366aca676e728c19d33c3d30f1cbfe38e11f27a.tar.bz2 | |
Modified the file extension filters for downloads to add some extensions to a default list for all platforms. Also added a few previously overlooked extensions for various platforms.
BUG=59817
TEST=None
Review URL: http://codereview.chromium.org/3899002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/download_exe.cc | 34 | ||||
| -rw-r--r-- | chrome/browser/download/download_manager_unittest.cc | 4 |
2 files changed, 21 insertions, 17 deletions
diff --git a/chrome/browser/download/download_exe.cc b/chrome/browser/download/download_exe.cc index e8d42f6..bb074e3 100644 --- a/chrome/browser/download/download_exe.cc +++ b/chrome/browser/download/download_exe.cc @@ -57,6 +57,24 @@ namespace download_util { * ***** END LICENSE BLOCK ***** */ static const char* const g_executables[] = { + "class", + "htm", + "html", + "jar", + "pdf", + "pl", + "py", + "rb", + "shtm", + "shtml", + "svg", + "swf", + "xht", + "xhtm", + "xhtml", + "xml", + "xsl", + "xslt", #if defined(OS_WIN) "ad", "ade", @@ -77,13 +95,10 @@ static const char* const g_executables[] = { "fxp", "hlp", "hta", - "htm", - "html", "htt", "inf", "ins", "isp", - "jar", "js", "jse", "lnk", @@ -126,9 +141,6 @@ static const char* const g_executables[] = { "sct", "shb", "shs", - "shtm", - "shtml", - "svg", "url", "vb", "vbe", @@ -143,14 +155,9 @@ static const char* const g_executables[] = { "wsf", "wsh", "xbap", - "xht", - "xhtm", - "xhtml", - "xml", - "xsl", - "xslt", #elif defined(OS_MACOSX) // TODO(thakis): Figure out what makes sense here -- crbug.com/19096 + "app", "dmg", #elif defined(OS_POSIX) // TODO(estade): lengthen this list. @@ -159,9 +166,6 @@ static const char* const g_executables[] = { "deb", "exe", "ksh", - "pl", - "py", - "rb", "rpm", "sh", "tcsh", diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index 3665e72..fdb088d 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -112,11 +112,11 @@ const struct { true, false, true, }, - { "http://www.foo.com/auto-open.pdf", + { "http://www.foo.com/always_prompt.pdf", "application/pdf", false, true, - false, }, + true, }, }; } // namespace |