diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 22:52:45 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 22:52:45 +0000 |
| commit | 46ece64e512cd4b642482b635a78376ba7bcc163 (patch) | |
| tree | 707f37cea9da93e55a4d885962203d93932afb56 | |
| parent | 50adcb2d31aa1d064a24209142e7981ab143afde (diff) | |
| download | chromium_src-46ece64e512cd4b642482b635a78376ba7bcc163.zip chromium_src-46ece64e512cd4b642482b635a78376ba7bcc163.tar.gz chromium_src-46ece64e512cd4b642482b635a78376ba7bcc163.tar.bz2 | |
Merge 204717 "Check dangerous Android file extensions on authent..."
> Check dangerous Android file extensions on authenticated download
>
> This fixes a bug that looked at POSIX file extensions instead
> on Android ones when on the Android platform.
>
> BUG=247031
>
> Review URL: https://chromiumcodereview.appspot.com/15778014
TBR=bengr@chromium.org
Review URL: https://codereview.chromium.org/16434009
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205332 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/download/download_extensions.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/download/download_extensions.cc b/chrome/browser/download/download_extensions.cc index 84a0ebc..67517e3 100644 --- a/chrome/browser/download/download_extensions.cc +++ b/chrome/browser/download/download_extensions.cc @@ -201,6 +201,11 @@ static const struct Executables { { "sh", AllowOnUserGesture }, { "shar", AllowOnUserGesture }, { "tcsh", AllowOnUserGesture }, +#elif defined(OS_ANDROID) + { "apk", AllowOnUserGesture }, + { "sh", AllowOnUserGesture }, + { "shar", AllowOnUserGesture }, + { "dex", AllowOnUserGesture }, #elif defined(OS_POSIX) // TODO(estade): lengthen this list. { "bash", AllowOnUserGesture }, @@ -212,11 +217,6 @@ static const struct Executables { { "sh", AllowOnUserGesture }, { "shar", AllowOnUserGesture }, { "tcsh", AllowOnUserGesture }, -#elif defined(OS_ANDROID) - { "apk", AllowOnUserGesture }, - { "sh", AllowOnUserGesture }, - { "shar", AllowOnUserGesture }, - { "dex", AllowOnUserGesture }, #endif }; |