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

Unified Diff: chrome/browser/ui/views/download/download_item_view.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/views/download/download_item_view.cc
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index b98ca173cafb2ebff80ba16f2b7ad9e214e62b0c..e03a1a050520481c893b19efea29c2b577dd714c 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
#include "chrome/browser/ui/views/download/download_shelf_view.h"
+#include "content/browser/download/download_state_info.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/accessibility/accessible_view_state.h"
@@ -254,14 +255,14 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
// The dangerous download label text and icon are different
// under different cases.
string16 dangerous_label;
- if (download->GetDangerType() == DownloadItem::DANGEROUS_URL) {
+ if (download->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) {
// Safebrowsing shows the download URL leads to malicious file.
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() == DownloadItem::DANGEROUS_FILE);
+ DCHECK(download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE);
warning_icon_ = rb.GetBitmapNamed(IDR_WARNING);
if (ChromeDownloadManagerDelegate::IsExtensionDownload(download)) {
dangerous_label =

Powered by Google App Engine
This is Rietveld 408576698