diff options
| author | Nathan Parker <nparker@chromium.org> | 2016-01-20 11:19:41 -0800 |
|---|---|---|
| committer | Nathan Parker <nparker@chromium.org> | 2016-01-20 19:21:55 +0000 |
| commit | 20a630c9c0a7b0efc0bb30f1bbecf76eb63de0b8 (patch) | |
| tree | 4fce38ff47f619ed36da06a9c312a0e602ed3c69 | |
| parent | 5071e949073b5a4007c8a59163ed0bd32b8ff742 (diff) | |
| download | chromium_src-20a630c9c0a7b0efc0bb30f1bbecf76eb63de0b8.zip chromium_src-20a630c9c0a7b0efc0bb30f1bbecf76eb63de0b8.tar.gz chromium_src-20a630c9c0a7b0efc0bb30f1bbecf76eb63de0b8.tar.bz2 | |
[Merge early M49] Add .vhdx file extension for SB download pings
BUG=575275
Review URL: https://codereview.chromium.org/1595653002
Cr-Commit-Position: refs/heads/master@{#370144}
(cherry picked from commit 29d3ece51d7eb7c50ae310a30d7bac29bf5f50d6)
Review URL: https://codereview.chromium.org/1602313004 .
Cr-Commit-Position: refs/branch-heads/2623@{#23}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | chrome/browser/download/download_extensions.cc | 1 | ||||
| -rw-r--r-- | chrome/common/safe_browsing/download_protection_util.cc | 2 | ||||
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/download/download_extensions.cc b/chrome/browser/download/download_extensions.cc index 12d0e4a..dea28b0 100644 --- a/chrome/browser/download/download_extensions.cc +++ b/chrome/browser/download/download_extensions.cc @@ -153,6 +153,7 @@ const struct FileType { {"uu", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, {"uue", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, {"vhd", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, + {"vhdx", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, // Opens in IE, drops MOTW {"vmdk", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, {"wim", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, {"wrc", NOT_DANGEROUS, ALLOW_AUTO_OPEN}, diff --git a/chrome/common/safe_browsing/download_protection_util.cc b/chrome/common/safe_browsing/download_protection_util.cc index 05b769a..8baa601 100644 --- a/chrome/common/safe_browsing/download_protection_util.cc +++ b/chrome/common/safe_browsing/download_protection_util.cc @@ -266,6 +266,7 @@ enum SBClientDownloadExtensions { EXTENSION_MSG, EXTENSION_EML, EXTENSION_RTF, + EXTENSION_VHDX, // New values go above this one. EXTENSION_MAX @@ -497,6 +498,7 @@ const SafeBrowsingFiletype kSafeBrowsingFileTypes[] = { {FILE_PATH_LITERAL(".vbs"), EXTENSION_VBS, true, false}, {FILE_PATH_LITERAL(".vbscript"), EXTENSION_VBSCRIPT, false, false}, // UMA. {FILE_PATH_LITERAL(".vhd"), EXTENSION_VHD, true, true}, + {FILE_PATH_LITERAL(".vhdx"), EXTENSION_VHDX, true, true}, {FILE_PATH_LITERAL(".vmdk"), EXTENSION_VMDK, true, true}, {FILE_PATH_LITERAL(".vsd"), EXTENSION_VSD, true, false}, {FILE_PATH_LITERAL(".vsmacros"), EXTENSION_VSMACROS, true, false}, diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index ea047ef..42c1fdd 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -76254,6 +76254,7 @@ To add a new entry, add it with any value and run test to compute valid value. <int value="242" label="MSG"/> <int value="243" label="EML"/> <int value="244" label="RTF"/> + <int value="245" label="VHDX"/> </enum> <enum name="SBClientDownloadIsSignedBinary" type="int"> |