Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: chrome/browser/ui/cocoa/download/download_item_mac.mm

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/download/download_item_mac.mm
diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.mm b/chrome/browser/ui/cocoa/download/download_item_mac.mm
index 2b17c0869e31db8318a4e89e88cc913a6cbab7f6..a6ea332fa7e3c77107054459dea3c6ab529140b9 100644
--- a/chrome/browser/ui/cocoa/download/download_item_mac.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_mac.mm
@@ -15,20 +15,21 @@ using content::DownloadItem;
// DownloadItemMac -------------------------------------------------------------
-DownloadItemMac::DownloadItemMac(DownloadItemModel* download_model,
+DownloadItemMac::DownloadItemMac(DownloadItem* download,
DownloadItemController* controller)
- : download_model_(download_model), item_controller_(controller) {
- download_model_->download()->AddObserver(this);
+ : download_model_(download),
+ item_controller_(controller) {
+ download_model_.download()->AddObserver(this);
}
DownloadItemMac::~DownloadItemMac() {
- download_model_->download()->RemoveObserver(this);
+ download_model_.download()->RemoveObserver(this);
}
void DownloadItemMac::OnDownloadUpdated(content::DownloadItem* download) {
- DCHECK_EQ(download, download_model_->download());
+ DCHECK_EQ(download, download_model_.download());
- if ([item_controller_ isDangerousMode] && !download_model_->IsDangerous()) {
+ if ([item_controller_ isDangerousMode] && !download_model_.IsDangerous()) {
// We have been approved.
[item_controller_ clearDangerousMode];
}
@@ -52,11 +53,11 @@ void DownloadItemMac::OnDownloadUpdated(content::DownloadItem* download) {
// fall through
case DownloadItem::IN_PROGRESS:
case DownloadItem::CANCELLED:
- [item_controller_ setStateFromDownload:download_model_.get()];
+ [item_controller_ setStateFromDownload:&download_model_];
break;
case DownloadItem::INTERRUPTED:
[item_controller_ updateToolTip];
- [item_controller_ setStateFromDownload:download_model_.get()];
+ [item_controller_ setStateFromDownload:&download_model_];
break;
default:
NOTREACHED();
@@ -68,7 +69,7 @@ void DownloadItemMac::OnDownloadDestroyed(content::DownloadItem* download) {
}
void DownloadItemMac::OnDownloadOpened(content::DownloadItem* download) {
- DCHECK_EQ(download, download_model_->download());
+ DCHECK_EQ(download, download_model_.download());
[item_controller_ downloadWasOpened];
}
@@ -80,7 +81,7 @@ void DownloadItemMac::LoadIcon() {
}
// We may already have this particular image cached.
- FilePath file = download_model_->download()->GetUserVerifiedFilePath();
+ FilePath file = download_model_.download()->GetUserVerifiedFilePath();
gfx::Image* icon = icon_manager->LookupIcon(file, IconLoader::ALL);
if (icon) {
[item_controller_ setIcon:icon->ToNSImage()];
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_mac.h ('k') | chrome/browser/ui/cocoa/download/download_shelf_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698