Add "Remove from list" for download item in the download shelf.

This would remove the download list (CTRL+J) as well.

BUG=60 (http://crbug.com/60)
TEST=Download a file from the net, download shelf appears, click the download item's arrow and "Remove from list". The item removes from the shelf and list.
Review URL: http://codereview.chromium.org/155749

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22143 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index d3d6ade..2be924f 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -55,6 +55,8 @@ std::wstring DownloadShelfContextMenu::GetItemLabel(int id) const {
       return l10n_util::GetString(IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE);
     case CANCEL:
       return l10n_util::GetString(IDS_DOWNLOAD_MENU_CANCEL);
+    case REMOVE_ITEM:
+      return l10n_util::GetString(IDS_DOWNLOAD_MENU_REMOVE_ITEM);
     default:
       NOTREACHED();
   }
@@ -70,6 +72,8 @@ bool DownloadShelfContextMenu::IsItemCommandEnabled(int id) const {
       return download_util::CanOpenDownload(download_);
     case CANCEL:
       return download_->state() == DownloadItem::IN_PROGRESS;
+    case REMOVE_ITEM:
+      return download_->state() == DownloadItem::COMPLETE;
     default:
       return id > 0 && id < MENU_LAST;
   }
@@ -93,6 +97,9 @@ void DownloadShelfContextMenu::ExecuteItemCommand(int id) {
     case CANCEL:
       model_->CancelTask();
       break;
+    case REMOVE_ITEM:
+      download_->Remove(false);
+      break;
     default:
       NOTREACHED();
   }