summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/download_item_gtk.h
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 22:46:42 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 22:46:42 +0000
commitd0aa2034a240084c5a5d4ae53de838ce5e09d211 (patch)
tree538b5060dab38f5dc0a82906e230b41504983f44 /chrome/browser/gtk/download_item_gtk.h
parentfbf90315b8420502dbad77b9741f7547b3f2187e (diff)
downloadchromium_src-d0aa2034a240084c5a5d4ae53de838ce5e09d211.zip
chromium_src-d0aa2034a240084c5a5d4ae53de838ce5e09d211.tar.gz
chromium_src-d0aa2034a240084c5a5d4ae53de838ce5e09d211.tar.bz2
GTK: make download shelf drags use the download icon.
This matches drags originating in the tabbed download manager. BUG=42147 TEST=manual Review URL: http://codereview.chromium.org/1690002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/download_item_gtk.h')
-rw-r--r--chrome/browser/gtk/download_item_gtk.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.h b/chrome/browser/gtk/download_item_gtk.h
index fbe2ec5..9cf6dc2 100644
--- a/chrome/browser/gtk/download_item_gtk.h
+++ b/chrome/browser/gtk/download_item_gtk.h
@@ -52,7 +52,10 @@ class DownloadItemGtk : public DownloadItem::Observer,
// Called when the icon manager has finished loading the icon. We take
// ownership of |icon_bitmap|.
- void OnLoadIconComplete(IconManager::Handle handle, SkBitmap* icon_bitmap);
+ void OnLoadSmallIconComplete(IconManager::Handle handle,
+ SkBitmap* icon_bitmap);
+ void OnLoadLargeIconComplete(IconManager::Handle handle,
+ SkBitmap* icon_bitmap);
// Returns the DownloadItem model object belonging to this item.
DownloadItem* get_download();
@@ -198,8 +201,10 @@ class DownloadItemGtk : public DownloadItem::Observer,
// Animation for download complete.
scoped_ptr<SlideAnimation> complete_animation_;
- // The file icon for the download. May be null.
- SkBitmap* icon_;
+ // The file icon for the download. May be null. The small version is used
+ // for display in the shelf; the large version is for use as a drag icon.
+ SkBitmap* icon_small_;
+ SkBitmap* icon_large_;
// The last download file path for which we requested an icon.
FilePath icon_filepath_;