chrome/browser/ui/views/download/download_item_view.cc - Issue 10704026: Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/download/download_item_view.cc

Issue 10704026: Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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

« chrome/browser/plugin_installer.cc ('K') | « chrome/browser/ui/views/download/download_item_view.h ('k') | chrome/browser/ui/webui/downloads_dom_handler.h » ('j') | content/browser/download/download_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/download/download_item_view.cc

diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc

index bcb59bece24a1aa9256fad00cfd074a03021f624..be88c78ace3cfd0693d2da57007aa9aca946ac52 100644

--- a/chrome/browser/ui/views/download/download_item_view.cc

+++ b/chrome/browser/ui/views/download/download_item_view.cc

@@ -297,9 +297,6 @@ void DownloadItemView::OnDownloadUpdated(DownloadItem* download) {

StopDownloadProgress();

LoadIcon();

break;

- case DownloadItem::REMOVING:

- parent_->RemoveDownloadView(this); // This will delete us!

- return;

default:

NOTREACHED();

}

@@ -320,6 +317,10 @@ void DownloadItemView::OnDownloadUpdated(DownloadItem* download) {

parent()->SchedulePaint();

}

+void DownloadItemView::OnDownloadDestroyed(DownloadItem* download) {

+ parent_->RemoveDownloadView(this); // This will delete us!

void DownloadItemView::OnDownloadOpened(DownloadItem* download) {

disabled_while_opening_ = true;

SetEnabled(false);