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

Unified Diff: chrome/browser/download/download_extension_api.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/download/download_extension_api.cc
diff --git a/chrome/browser/download/download_extension_api.cc b/chrome/browser/download/download_extension_api.cc
index dda5e78c0727505d96b6616c7e96994813457365..79de935f9361f47c7ea6134eee799eaadb2c7dd8 100644
--- a/chrome/browser/download/download_extension_api.cc
+++ b/chrome/browser/download/download_extension_api.cc
@@ -32,6 +32,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "content/browser/download/download_file_manager.h"
#include "content/browser/download/download_item.h"
+#include "content/browser/download/download_state_info.h"
#include "content/browser/download/download_types.h"
#include "content/browser/download/interrupt_reasons.h"
#include "content/browser/renderer_host/render_process_host.h"
@@ -53,6 +54,7 @@ const char kInvalidURL[] = "Invalid URL";
const char kBodyKey[] = "body";
const char kBytesReceivedKey[] = "bytesReceived";
const char kDangerAcceptedKey[] = "dangerAccepted";
+const char kDangerContent[] = "content";
const char kDangerFile[] = "file";
const char kDangerKey[] = "danger";
const char kDangerSafe[] = "safe";
@@ -77,11 +79,13 @@ const char kStateKey[] = "state";
const char kTotalBytesKey[] = "totalBytes";
const char kUrlKey[] = "url";
-const char* DangerString(DownloadItem::DangerType danger) {
+const char* DangerString(DownloadStateInfo::DangerType danger) {
switch (danger) {
- case DownloadItem::NOT_DANGEROUS: return kDangerSafe;
- case DownloadItem::DANGEROUS_FILE: return kDangerFile;
- case DownloadItem::DANGEROUS_URL: return kDangerUrl;
+ case DownloadStateInfo::MAYBE_DANGEROUS_CONTENT:
+ case DownloadStateInfo::NOT_DANGEROUS: return kDangerSafe;
+ case DownloadStateInfo::DANGEROUS_FILE: return kDangerFile;
+ case DownloadStateInfo::DANGEROUS_URL: return kDangerUrl;
+ case DownloadStateInfo::DANGEROUS_CONTENT: return kDangerContent;
default:
NOTREACHED();
return "";

Powered by Google App Engine
This is Rietveld 408576698