Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: chrome/browser/ui/gtk/download/download_item_gtk.cc

Issue 8468020: Propagate the SafeBrowsing download protection verdict to the DownloadItem. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 38bfa8473e1e1b0ea661d9d97a4134ae37a5bc45..7bef1e8206c971878af87f1bec8dbf2a96c8b4cf 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -560,14 +560,14 @@ void DownloadItemGtk::UpdateDangerWarning() {
string16 dangerous_warning;
// The dangerous download label text is different for different cases.
- if (get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL) {
+ if (get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) {
// Safebrowsing shows the download URL leads to malicious file.
dangerous_warning =
l10n_util::GetStringUTF16(IDS_PROMPT_UNSAFE_DOWNLOAD_URL);
} else {
// It's a dangerous file type (e.g.: an executable).
DCHECK(get_download()->GetDangerType() ==
- DownloadItem::DANGEROUS_FILE);
+ DownloadStateInfo::DANGEROUS_FILE);
if (ChromeDownloadManagerDelegate::IsExtensionDownload(get_download())) {
dangerous_warning =
l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
@@ -617,7 +617,7 @@ void DownloadItemGtk::UpdateDangerWarning() {
void DownloadItemGtk::UpdateDangerIcon() {
if (theme_service_->UsingNativeTheme()) {
const char* stock =
- get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL ?
+ get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ?
GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
gtk_image_set_from_stock(
GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -625,7 +625,7 @@ void DownloadItemGtk::UpdateDangerIcon() {
// Set the warning icon.
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
int pixbuf_id =
- get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL ?
+ get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ?
IDR_SAFEBROWSING_WARNING : IDR_WARNING;
GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(pixbuf_id);
gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_), download_pixbuf);

Powered by Google App Engine
This is Rietveld 408576698