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

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

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
« no previous file with comments | « chrome/browser/icon_manager.cc ('k') | chrome/browser/ui/cocoa/download/download_item_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/download/download_item_mac.h
diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h
index f1b5d77836df22de5bf4b44871d0c642ef32b151..b82c16d26c8cb8ec4db9cd365b85a127d4d36c90 100644
--- a/chrome/browser/ui/cocoa/download/download_item_mac.h
+++ b/chrome/browser/ui/cocoa/download/download_item_mac.h
@@ -9,8 +9,8 @@
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/common/cancelable_request.h"
#include "chrome/browser/icon_manager.h"
+#include "chrome/common/cancelable_task_tracker.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/download_manager.h"
@@ -46,8 +46,7 @@ class DownloadItemMac : content::DownloadItem::Observer {
private:
// Callback for asynchronous icon loading.
- void OnExtractIconComplete(IconManager::Handle handle,
- gfx::Image* icon_bitmap);
+ void OnExtractIconComplete(gfx::Image* icon_bitmap);
// The download item model we represent.
scoped_ptr<DownloadItemModel> download_model_;
@@ -56,7 +55,7 @@ class DownloadItemMac : content::DownloadItem::Observer {
DownloadItemController* item_controller_; // weak, owns us.
// For canceling an in progress icon request.
- CancelableRequestConsumerT<int, 0> icon_consumer_;
+ CancelableTaskTracker cancelable_task_tracker_;
// Stores the last known path where the file will be saved.
FilePath lastFilePath_;
« no previous file with comments | « chrome/browser/icon_manager.cc ('k') | chrome/browser/ui/cocoa/download/download_item_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698