Make malicious content download warning include the download filename

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 958 matching lines @@
 #endif
 
   // Elide giant extensions (this shouldn't currently be hit, but might
   // in future, should we ever notice unsafe giant extensions).
   if (extension.length() > kFileNameMaxLength / 2)
     ui::ElideString(extension, kFileNameMaxLength / 2, &extension);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // The dangerous download label text and icon are different
   // under different cases.
-  string16 dangerous_label;
   if (download_->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ||
-    download_->GetDangerType() == DownloadStateInfo::DANGEROUS_CONTENT) {
-    // TODO(noelutz): add the target filename to the warning message in the
-    // case of a dangerous content warning.
-    // Safebrowsing shows the download URL or content leads to malicious file.
+      download_->GetDangerType() == DownloadStateInfo::DANGEROUS_CONTENT) {
     warning_icon_ = rb.GetBitmapNamed(IDR_SAFEBROWSING_WARNING);
-    dangerous_label =
-        l10n_util::GetStringUTF16(IDS_PROMPT_UNSAFE_DOWNLOAD_URL);
   } else {
-    // The download file has dangerous file type (e.g.: an executable).
     DCHECK(download_->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE);
     warning_icon_ = rb.GetBitmapNamed(IDR_WARNING);
-    if (ChromeDownloadManagerDelegate::IsExtensionDownload(download_)) {
-      dangerous_label =
-          l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
-    } else {
-      ui::ElideString(rootname,
-                      kFileNameMaxLength - extension.length(),
-                      &rootname);
-      string16 filename = rootname + ASCIIToUTF16(".") + extension;
-      filename = base::i18n::GetDisplayStringInLTRDirectionality(filename);
-      dangerous_label =
-          l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD, filename);
-    }
+  }
+  string16 dangerous_label;
+  if (download_->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) {
+    // Safebrowsing shows the download URL or content leads to malicious file.
+    dangerous_label = l10n_util::GetStringUTF16(
+        IDS_PROMPT_MALICIOUS_DOWNLOAD_URL);
+  } else if (download_->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE &&
+             ChromeDownloadManagerDelegate::IsExtensionDownload(download_)) {
+    dangerous_label =
+        l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
+  } else {
+    // The download file has dangerous file type (e.g.: an executable) or the
+    // file content is known to be malicious.
+    DCHECK(download_->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ||
+           download_->GetDangerType() == DownloadStateInfo::DANGEROUS_CONTENT);
+    ui::ElideString(rootname,
+                    kFileNameMaxLength - extension.length(),
+                    &rootname);
+    string16 filename = rootname + ASCIIToUTF16(".") + extension;
+    filename = base::i18n::GetDisplayStringInLTRDirectionality(filename);
+    dangerous_label = l10n_util::GetStringFUTF16(
+        download_->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ?
+            IDS_PROMPT_DANGEROUS_DOWNLOAD :
+            IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT,
+        filename);
   }
 
   dangerous_download_label_ = new views::Label(dangerous_label);
   dangerous_download_label_->SetMultiLine(true);
   dangerous_download_label_->SetHorizontalAlignment(
       views::Label::ALIGN_LEFT);
   dangerous_download_label_->SetAutoColorReadabilityEnabled(false);
   AddChildView(dangerous_download_label_);
   SizeLabelToMinWidth();
 }
@@ skipping 110 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }