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

Unified Diff: chrome/browser/download/download_shelf.cc

Issue 246004: Remove the context menu item 'Remove from list' from download shelf (Closed)
Patch Set: rebased Created 11 years, 3 months 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
« no previous file with comments | « chrome/browser/download/download_shelf.h ('k') | chrome/browser/views/download_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_shelf.cc
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index 40d8bef7699ef9fb24fdb6ea7e30ec4fd649d73c..ba41c166810f1f3df46e53b4e822fa7039cf8b8f 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -59,8 +59,6 @@ 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);
case TOGGLE_PAUSE: {
if (download_->is_paused())
return l10n_util::GetString(IDS_DOWNLOAD_MENU_RESUME_ITEM);
@@ -82,9 +80,6 @@ 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 ||
- download_->state() == DownloadItem::CANCELLED;
case TOGGLE_PAUSE:
return download_->state() == DownloadItem::IN_PROGRESS;
default:
@@ -110,12 +105,6 @@ void DownloadShelfContextMenu::ExecuteItemCommand(int id) {
case CANCEL:
model_->CancelTask();
break;
- case REMOVE_ITEM:
- download_->Remove(false);
- // |download_| has been deleted now, prevent further access to it.
- download_ = NULL;
- model_ = NULL;
- break;
case TOGGLE_PAUSE:
// It is possible for the download to complete before the user clicks the
// menu item, recheck if the download is in progress state before toggling
« no previous file with comments | « chrome/browser/download/download_shelf.h ('k') | chrome/browser/views/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698