Refactor dangerous download warning text generation into DownloadItemModel.

chrome/browser/download/download_shelf_context_menu.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/download/download_shelf_context_menu.h"
 
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 10 matching lines @@
 DownloadShelfContextMenu::~DownloadShelfContextMenu() {}
 
 DownloadShelfContextMenu::DownloadShelfContextMenu(
     BaseDownloadItemModel* download_model)
     : download_model_(download_model),
       download_item_(download_model->download()) {
 }
 
 ui::SimpleMenuModel* DownloadShelfContextMenu::GetMenuModel() {
   ui::SimpleMenuModel* model = NULL;
+  // We shouldn't be opening a context menu for a dangerous download, unless it
+  // is a malicious download.
+  DCHECK(!download_model_->IsDangerous() || download_model_->IsMalicious());
 
-  if (download_item_->GetSafetyState() == DownloadItem::DANGEROUS) {
-    if (download_item_->GetDangerType() ==
-            content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
-        download_item_->GetDangerType() ==
-            content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT) {
-      model = GetMaliciousMenuModel();
-    } else {
-      NOTREACHED();
-    }
-  } else if (download_item_->IsComplete()) {
+  if (download_model_->IsMalicious())
+    model = GetMaliciousMenuModel();
+  else if (download_item_->IsComplete())
     model = GetFinishedMenuModel();
-  } else {
+  else
     model = GetInProgressMenuModel();
-  }
   return model;
 }
 
 bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case SHOW_IN_FOLDER:
     case OPEN_WHEN_COMPLETE:
       return download_item_->CanShowInFolder();
     case ALWAYS_OPEN_TYPE:
       return download_item_->CanOpenDownload() &&
@@ skipping 157 matching lines @@
   malicious_download_menu_model_->AddItemWithStringId(
       DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
   malicious_download_menu_model_->AddItemWithStringId(
       KEEP, IDS_DOWNLOAD_MENU_KEEP);
   malicious_download_menu_model_->AddSeparator();
   malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE, IDS_DOWNLOAD_MENU_LEARN_MORE);
 
   return malicious_download_menu_model_.get();
 }