summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_shelf_context_menu.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:24:38 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:24:38 +0000
commita62d42908f4fcb66a60808025435ecd67b89cf0a (patch)
treeeefa595673e6ddc566f0b2078352b005e35561c9 /chrome/browser/download/download_shelf_context_menu.cc
parent3d0824177f14eba2dbc775dc35ea9c5a5cac1f0f (diff)
downloadchromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.zip
chromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.tar.gz
chromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.tar.bz2
Move DownloadDangerType to its own file.
BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9141031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_shelf_context_menu.cc')
-rw-r--r--chrome/browser/download/download_shelf_context_menu.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc
index b676e4c..d667b09 100644
--- a/chrome/browser/download/download_shelf_context_menu.cc
+++ b/chrome/browser/download/download_shelf_context_menu.cc
@@ -31,9 +31,10 @@ ui::SimpleMenuModel* DownloadShelfContextMenu::GetMenuModel() {
ui::SimpleMenuModel* model = NULL;
if (download_item_->GetSafetyState() == DownloadItem::DANGEROUS) {
- if (download_item_->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ||
+ if (download_item_->GetDangerType() ==
+ content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
download_item_->GetDangerType() ==
- DownloadStateInfo::DANGEROUS_CONTENT) {
+ content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT) {
model = GetMaliciousMenuModel();
} else {
NOTREACHED();
@@ -53,7 +54,7 @@ bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
return download_item_->CanShowInFolder();
case ALWAYS_OPEN_TYPE:
return download_item_->CanOpenDownload() &&
- !Extension::IsExtension(download_item_->GetStateInfo().target_name);
+ !Extension::IsExtension(download_item_->GetTargetName());
case CANCEL:
return download_item_->IsPartialDownload();
case TOGGLE_PAUSE: