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

Unified Diff: chrome/browser/ui/cocoa/download/download_item_controller.mm

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/cocoa/download/download_item_controller.mm
diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm
index eb854ba1fc5d5fad20d349faa1a2229479ed5a7d..90a297e74ee58819dea93d2549d16ee2d329770d 100644
--- a/chrome/browser/ui/cocoa/download/download_item_controller.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm
@@ -22,6 +22,7 @@
#import "chrome/browser/ui/cocoa/themed_window.h"
#import "chrome/browser/ui/cocoa/ui_localizer.h"
#include "content/browser/download/download_item.h"
+#include "content/browser/download/download_state_info.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ -173,7 +174,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
// The dangerous download label, button text and icon are different under
// different cases.
if (downloadModel->download()->GetDangerType() ==
- DownloadItem::DANGEROUS_URL) {
+ DownloadStateInfo::DANGEROUS_URL) {
// Safebrowsing shows the download URL leads to malicious file.
alertIcon = rb.GetNativeImageNamed(IDR_SAFEBROWSING_WARNING);
dangerousWarning = l10n_util::GetNSStringWithFixup(
@@ -183,7 +184,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
} else {
// It's a dangerous file type (e.g.: an executable).
DCHECK_EQ(downloadModel->download()->GetDangerType(),
- DownloadItem::DANGEROUS_FILE);
+ DownloadStateInfo::DANGEROUS_FILE);
alertIcon = rb.GetNativeImageNamed(IDR_WARNING);
if (ChromeDownloadManagerDelegate::IsExtensionDownload(
downloadModel->download())) {

Powered by Google App Engine
This is Rietveld 408576698