chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.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/webui/chromeos/imageburner/imageburner_ui.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: Fixed various problems surfaced by trybots. 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/webui/chromeos/imageburner/imageburner_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

index ab79ef61358aeec6614d474d59c4fae2c2a1e32a..06e22a28347413a1ee1424c9adea7e2fc368f2fa 100644

--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

@@ -513,7 +513,7 @@ void WebUIHandler::ProcessError(int message_id) {

// We don't want to process Download Cancelled signal.

active_download_item_->RemoveObserver(this);

if (active_download_item_->IsPartialDownload())

- active_download_item_->Cancel(true);

+ active_download_item_->Cancel();

active_download_item_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);

active_download_item_ = NULL;

CleanupDownloadObjects();

@@ -674,4 +674,3 @@ ImageBurnUI::ImageBurnUI(TabContents* contents) : ChromeWebUI(contents) {

imageburner::UIHTMLSource* html_source = new imageburner::UIHTMLSource();

contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);

}