Add support for multiple icon sizes for Mac platform apps

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
 #include "webkit/glue/image_decoder.h"
 
 namespace {
 
 scoped_refptr<RefCountedMemory> BitmapToMemory(const SkBitmap* image) {
   RefCountedBytes* image_bytes = new RefCountedBytes;
   gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_bytes->data());
   return image_bytes;
 }
 
-void DesaturateImage(SkBitmap* image) {
+SkBitmap DesaturateImage(const SkBitmap* image) {
   color_utils::HSL shift = {-1, 0, 0.6};
-  *image = SkBitmapOperations::CreateHSLShiftedBitmap(*image, shift);
+  return SkBitmapOperations::CreateHSLShiftedBitmap(*image, shift);
 }
 
 SkBitmap* ToBitmap(const unsigned char* data, size_t size) {
   webkit_glue::ImageDecoder decoder;
   SkBitmap* decoded = new SkBitmap();
   *decoded = decoder.Decode(data, size);
   return decoded;
 }
 
 }  // namespace
@@ skipping 108 matching lines @@
 
 const SkBitmap* ExtensionIconSource::GetDefaultExtensionImage() {
   if (!default_extension_data_.get()) {
     default_extension_data_.reset(
         LoadImageByResourceId(IDR_EXTENSION_DEFAULT_ICON));
   }
 
   return default_extension_data_.get();
 }
 
-void ExtensionIconSource::FinalizeImage(SkBitmap* image,
+void ExtensionIconSource::FinalizeImage(const SkBitmap* image,
                                         int request_id) {
+  SkBitmap bitmap;
   if (GetData(request_id)->grayscale)
-    DesaturateImage(image);
+    bitmap = DesaturateImage(image);
+  else
+    bitmap = *image;
 
   ClearData(request_id);
-  SendResponse(request_id, BitmapToMemory(image));
+  SendResponse(request_id, BitmapToMemory(&bitmap));
 }
 
 void ExtensionIconSource::LoadDefaultImage(int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
   const SkBitmap* default_image = NULL;
 
   if (request->extension->id() == extension_misc::kWebStoreAppId)
     default_image = GetWebStoreImage();
   else if (request->extension->is_app())
     default_image = GetDefaultAppImage();
@@ skipping 79 matching lines @@
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
     ClearData(request_id);
     SendResponse(request_id, favicon.image_data);
   } else {
     FinalizeImage(ToBitmap(favicon.image_data->front(),
                            favicon.image_data->size()), request_id);
   }
 }
 
-void ExtensionIconSource::OnImageLoaded(SkBitmap* image,
-                                        const ExtensionResource& resource,
+void ExtensionIconSource::OnImageLoaded(const gfx::Image* image,
+                                        const std::string& extension_id,
                                         int index) {
   int request_id = tracker_map_[index];
   tracker_map_.erase(tracker_map_.find(index));
 
-  if (!image || image->empty())
+  if (!image || image->IsEmpty())
     LoadIconFailed(request_id);
   else
-    FinalizeImage(image, request_id);
+    FinalizeImage(image->ToSkBitmap(), request_id);
 }
 
 bool ExtensionIconSource::ParseData(const std::string& path,
                                     int request_id) {
   // Extract the parameters from the path by lower casing and splitting.
   std::string path_lower = StringToLowerASCII(path);
   std::vector<std::string> path_parts;
 
   base::SplitString(path_lower, '/', &path_parts);
   if (path_lower.empty() || path_parts.size() < 3)
@@ skipping 65 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }