chrome/browser/ui/browser.cc - Issue 11673004: No need to pass DownloadItemModel ownership.

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/browser.cc

Issue 11673004: No need to pass DownloadItemModel ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: DownloadShelfContextMenu class cleanup and require GetMenuModel() to return non-NULL Created 7 years, 11 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/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 08019724638feb4bba451acccd367ed1f1cd2e86..055b83e2d6d7e02d3ea641416d04c535fde478c7 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -1494,8 +1494,7 @@ int Browser::GetExtraRenderViewHeight() const {

void Browser::OnStartDownload(WebContents* source,

content::DownloadItem* download) {

- scoped_ptr<DownloadItemModel> download_model(new DownloadItemModel(download));

- if (!download_model->ShouldShowInShelf())

+ if (!DownloadItemModel(download).ShouldShowInShelf())

return;

WebContents* constrained = GetConstrainingWebContents(source);

@@ -1510,7 +1509,7 @@ void Browser::OnStartDownload(WebContents* source,

// GetDownloadShelf creates the download shelf if it was not yet created.

DownloadShelf* shelf = window()->GetDownloadShelf();

- shelf->AddDownload(download_model.release());

+ shelf->AddDownload(download);

// Don't show the animation for "Save file" downloads.

// For non-theme extensions, we don't show the download animation.

// Show animation in same window as the download shelf. Download shelf