Load Mac download shelf icons asynchronously.

BUG=16226 (http://crbug.com/16226)
TEST=none.

Review URL: http://codereview.chromium.org/155831

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21305 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm
index f5d2836..d00fd58 100644
--- a/chrome/browser/cocoa/download_item_controller.mm
+++ b/chrome/browser/cocoa/download_item_controller.mm
@@ -51,6 +51,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
 
 - (void)awakeFromNib {
   [self setStateFromDownload:bridge_->download_model()];
+  bridge_->LoadIcon();
 }
 
 - (void)setStateFromDownload:(BaseDownloadItemModel*)downloadModel {
@@ -58,7 +59,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
   // (gratituous use of animation, special handling of dangerous downloads)
   // that we don't currently do.
 
-  // Set correct popup menu.
+  // Set the correct popup menu.
   if (downloadModel->download()->state() == DownloadItem::COMPLETE)
     currentMenu_ = completeDownloadMenu_;
   else
@@ -68,6 +69,10 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
   [cell_ setStateFromDownload:downloadModel];
 }
 
+- (void)setIcon:(NSImage*)icon {
+  [cell_ setImage:icon];
+}
+
 - (void)remove {
   // We are deleted after this!
   [shelf_ remove:self];