| Index: chrome/browser/download/download_util.cc
|
| diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
|
| index 2081c9d9b6a562d7448a2dd6550f78b51219fb8f..f751db4bd7e0f6a7711d0966e99eeb5ed343b7f0 100644
|
| --- a/chrome/browser/download/download_util.cc
|
| +++ b/chrome/browser/download/download_util.cc
|
| @@ -86,8 +86,8 @@ namespace {
|
|
|
| // Returns a string constant to be used as the |danger_type| value in
|
| // CreateDownloadItemValue(). We only return strings for DANGEROUS_FILE,
|
| -// DANGEROUS_URL and DANGEROUS_CONTENT because the |danger_type| value is only
|
| -// defined if the value of |state| is |DANGEROUS|.
|
| +// DANGEROUS_URL, DANGEROUS_CONTENT, and UNCOMMON_CONTENT because the
|
| +// |danger_type| value is only defined if the value of |state| is |DANGEROUS|.
|
| const char* GetDangerTypeString(content::DownloadDangerType danger_type) {
|
| switch (danger_type) {
|
| case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
|
| @@ -96,6 +96,8 @@ const char* GetDangerTypeString(content::DownloadDangerType danger_type) {
|
| return "DANGEROUS_URL";
|
| case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
|
| return "DANGEROUS_CONTENT";
|
| + case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
|
| + return "UNCOMMON_CONTENT";
|
| default:
|
| // We shouldn't be returning a danger type string if it is
|
| // NOT_DANGEROUS or MAYBE_DANGEROUS_CONTENT.
|
| @@ -458,7 +460,9 @@ DictionaryValue* CreateDownloadItemValue(DownloadItem* download, int id) {
|
| download->GetDangerType() ==
|
| content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
|
| download->GetDangerType() ==
|
| - content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT);
|
| + content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT ||
|
| + download->GetDangerType() ==
|
| + content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT);
|
| const char* danger_type_value =
|
| GetDangerTypeString(download->GetDangerType());
|
| file_value->SetString("danger_type", danger_type_value);
|
|
|