Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/extension_icon_manager.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/extensions/extension_icon_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/favicon_size.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 // Helper function to create a new bitmap with |padding| amount of empty space
 // around the original bitmap.
 static SkBitmap ApplyPadding(const SkBitmap& source,
                              const gfx::Insets& padding) {
   scoped_ptr<gfx::CanvasSkia> result(
@@ skipping 44 matching lines @@
   DCHECK_EQ(gfx::kFaviconSize + padding_.width(), result->width());
   DCHECK_EQ(gfx::kFaviconSize + padding_.height(), result->height());
   return *result;
 }
 
 void ExtensionIconManager::RemoveIcon(const std::string& extension_id) {
   icons_.erase(extension_id);
   pending_icons_.erase(extension_id);
 }
 
-void ExtensionIconManager::OnImageLoaded(SkBitmap* image,
-                                         const ExtensionResource& resource,
+void ExtensionIconManager::OnImageLoaded(const gfx::Image& image,
+                                         const std::string& extension_id,
                                          int index) {
-  if (!image)
+  if (image.IsEmpty())
     return;
 
-  const std::string extension_id = resource.extension_id();
-
   // We may have removed the icon while waiting for it to load. In that case,
   // do nothing.
   if (!ContainsKey(pending_icons_, extension_id))
     return;
 
   pending_icons_.erase(extension_id);
-  icons_[extension_id] = ApplyTransforms(*image);
+  icons_[extension_id] = ApplyTransforms(*image.ToSkBitmap());
 }
 
 void ExtensionIconManager::EnsureDefaultIcon() {
   if (default_icon_.empty()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     SkBitmap* src = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
     default_icon_ = ApplyTransforms(*src);
   }
 }
 
@@ skipping 10 matching lines @@
   if (monochrome_) {
     color_utils::HSL shift = {-1, 0, 0.6};
     result = SkBitmapOperations::CreateHSLShiftedBitmap(result, shift);
   }
 
   if (!padding_.empty())
     result = ApplyPadding(result, padding_);
 
   return result;
 }