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

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

Issue 11441006: Convert IconManager to use new CancelableTaskTracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix mac compiling Created 8 years 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 4e69a6095bd950b9f3680ba923d9b58da9b3007d..2b17c0869e31db8318a4e89e88cc913a6cbab7f6 100644
--- a/chrome/browser/ui/cocoa/download/download_item_mac.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_mac.mm
@@ -23,7 +23,6 @@ DownloadItemMac::DownloadItemMac(DownloadItemModel* download_model,
DownloadItemMac::~DownloadItemMac() {
download_model_->download()->RemoveObserver(this);
- icon_consumer_.CancelAllRequests();
}
void DownloadItemMac::OnDownloadUpdated(content::DownloadItem* download) {
@@ -89,13 +88,14 @@ void DownloadItemMac::LoadIcon() {
}
// The icon isn't cached, load it asynchronously.
- icon_manager->LoadIcon(file, IconLoader::ALL, &icon_consumer_,
+ icon_manager->LoadIcon(file,
+ IconLoader::ALL,
base::Bind(&DownloadItemMac::OnExtractIconComplete,
- base::Unretained(this)));
+ base::Unretained(this)),
+ &cancelable_task_tracker_);
}
-void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle,
- gfx::Image* icon) {
+void DownloadItemMac::OnExtractIconComplete(gfx::Image* icon) {
if (!icon)
return;
[item_controller_ setIcon:icon->ToNSImage()];
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_mac.h ('k') | chrome/browser/ui/gtk/download/download_item_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698