Mac: Fix icons in download dom UI

chrome/browser/icon_loader_mac.mm

Index: chrome/browser/icon_loader_mac.mm
diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm
index 9b26ff38a22bdab5b138dce8064a3cc8d7690fd6..8502a7d40157056d609d8c85d4b123c059e9df14 100644
--- a/chrome/browser/icon_loader_mac.mm
+++ b/chrome/browser/icon_loader_mac.mm
@@ -17,9 +17,24 @@ void IconLoader::ReadIcon() {
   NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
   NSImage* icon = [workspace iconForFileType:group];
 
-  // Mac will ignore the size because icons have multiple size representations
-  // and NSImage choses the best at draw-time.
-  image_.reset(new gfx::Image([icon retain]));
+  if (icon_size_ == ALL) {
+    // The NSImage already has all sizes.
+    image_.reset(new gfx::Image([icon retain]));
+  } else {
+    NSSize size = NSZeroSize;
+    switch (icon_size_) {
+      case IconLoader::SMALL:
+        size = NSMakeSize(16, 16);
+        break;
+      case IconLoader::NORMAL:
+        size = NSMakeSize(32, 32);
+        break;
+      default:
+        NOTREACHED();
+    }
+    image_.reset(new gfx::Image(new SkBitmap(

[Robert Sesek, 2011/06/08 12:57:31]

Why go through Skia? Can't this be done the Cocoa way?

[sail, 2011/06/08 19:23:42]

Do you mean doing -[NSImage setSize:]? If so that doesn't help in this case
since gfx::Image will still just grab the first NSImageRep from the image when
the caller converts it to a SkBitmap.

There are a couple of advantages to converting to SkBitmap now instead of later:
- we know the requested size so we can get NSImage to create a rendering at the
size that we want
- conversion to SkBitmap can be expensive so its better to do this here than
block the caller's UI thread

[Robert Sesek, 2011/06/08 20:09:48]

Yes, but you could pull out an individual representation and create a new
NSImage with it.
Both of these sound like good reasons to keep this. Ignore my comment.

+        gfx::NSImageToSkBitmap(icon, size, false))));
+  }
 
   target_message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &IconLoader::NotifyDelegate));