wip

chrome/browser/ui/webui/extensions/extension_icon_source.cc

Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index 8198b2aaddebb87535b4440159a3a17078aac48b..073c6186df2dfc1e8b1166f935ff1e9185a65a35 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -32,6 +32,8 @@
 
 namespace {
 
+// Hmm, this sends desaturated favicons to the renderer. We either need our own
+// binary serialization of multiple pngs, or we just use ico.
 scoped_refptr<base::RefCountedMemory> BitmapToMemory(const SkBitmap* image) {
   base::RefCountedBytes* image_bytes = new base::RefCountedBytes;
   gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_bytes->data());
@@ -237,10 +239,11 @@ void ExtensionIconSource::OnFaviconDataAvailable(
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
     ClearData(request_id);
-    SendResponse(request_id, favicon.bitmap_data);
+    SendResponse(request_id, favicon.variants[0].bitmap_data);
   } else {
-    FinalizeImage(ToBitmap(favicon.bitmap_data->front(),
-                           favicon.bitmap_data->size()), request_id);
+    FinalizeImage(ToBitmap(
+          favicon.variants[0].bitmap_data->front(),
+          favicon.variants[0].bitmap_data->size()), request_id);
   }
 }