chrome/browser/download/download_item.cc - Issue 7640021: Move some Chrome-specific code paths out of DownloadManager and into the delegate. Getting rid of...

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/download/download_item.cc

Issue 7640021: Move some Chrome-specific code paths out of DownloadManager and into the delegate. Getting rid of... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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/chrome_download_manager_delegate.cc ('k') | chrome/browser/download/download_manager.h » ('j') | chrome/browser/download/download_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_item.cc

===================================================================

--- chrome/browser/download/download_item.cc (revision 96577)

+++ chrome/browser/download/download_item.cc (working copy)

@@ -20,6 +20,7 @@

#include "chrome/browser/download/download_file_manager.h"

#include "chrome/browser/download/download_history.h"

#include "chrome/browser/download/download_manager.h"

+#include "chrome/browser/download/download_manager_delegate.h"

#include "chrome/browser/download/download_prefs.h"

#include "chrome/browser/download/download_state_info.h"

#include "chrome/browser/download/download_util.h"

@@ -257,7 +258,7 @@

}

bool DownloadItem::ShouldOpenFileBasedOnExtension() {

- return download_manager_->ShouldOpenFileBasedOnExtension(

+ return download_manager_->delegate()->ShouldOpenFileBasedOnExtension(

GetUserVerifiedFilePath());

}

@@ -434,8 +435,7 @@

// Extensions should already have been unpacked and opened.

DCHECK(auto_opened_);

} else if (open_when_complete() ||

- download_manager_->ShouldOpenFileBasedOnExtension(

- GetUserVerifiedFilePath()) ||

+ ShouldOpenFileBasedOnExtension() ||

is_temporary()) {

// If the download is temporary, like in drag-and-drop, do not open it but

// we still need to set it auto-opened so that it can be removed from the