chrome/browser/ui/views/download/download_item_view.cc - Issue 7294013: Modified cancel and interrupt processing to avoid race with history.

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 7294013: Modified cancel and interrupt processing to avoid race with history. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Incorporated comments, fixed some stuff from try jobs. Created 9 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:

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 2aa0558e8800c64a92e0bff38b7aab745c844c35..3f3c2a1d86cd86387c4bc3f455dcf1d6d7d9e9cb 100644

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

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

@@ -655,7 +655,7 @@ void DownloadItemView::ButtonPressed(

UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",

base::Time::Now() - creation_time_);

if (download_->IsPartialDownload())

- download_->Cancel(true);

+ download_->Cancel();

download_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);

// WARNING: we are deleted at this point. Don't access 'this'.

} else if (sender == save_button_) {