Index: chrome/browser/ui/gtk/download/download_item_gtk.cc |
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc |
index d36057254dcfc4babb979eef2aacecfd0a5fd749..7edb49946c406fe6c0d834c51b3089fd756145ea 100644 |
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc |
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc |
@@ -566,31 +566,8 @@ void DownloadItemGtk::UpdateDangerWarning() { |
// We create |dangerous_warning| as a wide string so we can more easily |
// calculate its length in characters. |
- string16 dangerous_warning; |
- |
- // The dangerous download label text is different for different cases. |
- if (get_download()->GetDangerType() == |
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL) { |
- // TODO(noelutz): handle malicious content warning. |
- // Safebrowsing shows the download URL leads to malicious file. |
- dangerous_warning = |
- l10n_util::GetStringUTF16(IDS_PROMPT_MALICIOUS_DOWNLOAD_URL); |
- } else { |
- // It's a dangerous file type (e.g.: an executable). |
- DCHECK(get_download()->GetDangerType() == |
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE); |
- if (ChromeDownloadManagerDelegate::IsExtensionDownload(get_download())) { |
- dangerous_warning = |
- l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION); |
- } else { |
- string16 elided_filename = ui::ElideFilename( |
- get_download()->GetTargetName(), gfx::Font(), kTextWidth); |
- dangerous_warning = |
- l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD, |
- elided_filename); |
- } |
- } |
- |
+ string16 dangerous_warning = |
+ download_model_->GetWarningText(gfx::Font(), kTextWidth); |
if (theme_service_->UsingNativeTheme()) { |
gtk_util::SetLabelColor(dangerous_label_, NULL); |
} else { |
@@ -637,17 +614,15 @@ void DownloadItemGtk::UpdateDangerWarning() { |
void DownloadItemGtk::UpdateDangerIcon() { |
if (theme_service_->UsingNativeTheme()) { |
- const char* stock = get_download()->GetDangerType() == |
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ? |
- GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING; |
+ const char* stock = download_model_->IsMalicious() ? |
+ GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING; |
gtk_image_set_from_stock( |
GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR); |
} else { |
// Set the warning icon. |
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
- int pixbuf_id = get_download()->GetDangerType() == |
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ? |
- IDR_SAFEBROWSING_WARNING : IDR_WARNING; |
+ int pixbuf_id = download_model_->IsMalicious() ? |
+ IDR_SAFEBROWSING_WARNING : IDR_WARNING; |
GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(pixbuf_id); |
gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_), download_pixbuf); |
} |