Mac: Fix icons in download dom UI

Icons in the download DOM UI were very fuzzy.

This was a regression due to r76743.

The problem was that IconLoad was returning a multi-resolution image but callers weren't multi-resolution aware.

For example, the download DOM UI would encode the image to PNG but it would just pick the first bitmap which happened to be 16x16. This caused icons in the DOM UI to look fuzzy.

I think there are two fixes for this:
1. Change IconLoader so that callers no longer specify the icon size. Instead, callers must pick the right resolution when they get the icon loaded callback.
2. Have callers specify that they want all resolutions.

I went with 2 because always loading all icon sizes can be expensive.

BUG=84741
TEST=Ran and verified that the downloads UI looks good.


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

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

chrome/browser/icon_loader.h

@@ -40,7 +40,8 @@ class IconLoader : public base::RefCountedThreadSafe<IconLoader> {
   enum IconSize {
     SMALL = 0,  // 16x16
     NORMAL,     // 32x32
-    LARGE
+    LARGE,      // Windows: 32x32, Linux: 48x48, Mac: Unsupported
+    ALL,        // All sizes available
   };
 
   class Delegate {

chrome/browser/icon_loader_linux.cc

@@ -16,12 +16,20 @@
 #include "base/string_util.h"
 
 static int SizeToInt(IconLoader::IconSize size) {
-  int pixels = 48;
-  if (size == IconLoader::NORMAL)
-    pixels = 32;
-  else if (size == IconLoader::SMALL)
-    pixels = 16;
-
+  int pixels = 0;
+  switch (size) {
+    case IconLoader::SMALL:
+      pixels = 16;
+      break;
+    case IconLoader::NORMAL:
+      pixels = 32;
+      break;
+    case IconLoader::LARGE:
+      pixels = 48;
+      break;
+    default:
+      NOTREACHED();
+  }
   return pixels;
 }
 

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(
+        gfx::NSImageToSkBitmap(icon, size, false))));
+  }
 
   target_message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &IconLoader::NotifyDelegate));

chrome/browser/ui/cocoa/download/download_item_mac.mm

@@ -79,14 +79,14 @@ void DownloadItemMac::LoadIcon() {
 
   // We may already have this particular image cached.
   FilePath file = download_model_->download()->GetUserVerifiedFilePath();
-  gfx::Image* icon = icon_manager->LookupIcon(file, IconLoader::SMALL);
+  gfx::Image* icon = icon_manager->LookupIcon(file, IconLoader::ALL);
   if (icon) {
     [item_controller_ setIcon:*icon];
     return;
   }
 
   // The icon isn't cached, load it asynchronously.
-  icon_manager->LoadIcon(file, IconLoader::SMALL, &icon_consumer_,
+  icon_manager->LoadIcon(file, IconLoader::ALL, &icon_consumer_,
                          NewCallback(this,
                                      &DownloadItemMac::OnExtractIconComplete));
 }