Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/ui/cocoa/download/download_item_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf_context_menu.h"
 #include "chrome/browser/download/download_util.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/download/download_item_button.h"
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 #include "chrome/browser/ui/cocoa/download/download_item_mac.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #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"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
@@ skipping 131 matching lines @@
     [self setState:kDangerous];
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     NSString* dangerousWarning;
     NSString* confirmButtonTitle;
     NSImage* alertIcon;
 
     // 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(
           IDS_PROMPT_UNSAFE_DOWNLOAD_URL);
       confirmButtonTitle = l10n_util::GetNSStringWithFixup(
           IDS_CONFIRM_DOWNLOAD);
     } 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())) {
         dangerousWarning = l10n_util::GetNSStringWithFixup(
             IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
         confirmButtonTitle = l10n_util::GetNSStringWithFixup(
             IDS_CONTINUE_EXTENSION_DOWNLOAD);
       } else {
         // This basic fixup copies Windows DownloadItemView::DownloadItemView().
 
@@ skipping 215 matching lines @@
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_PAUSE_ITEM)];
   } else {
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_RESUME_ITEM)];
   }
   menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);
 }
 
 @end