Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/extension_uninstall_dialog.cc

Index: chrome/browser/extensions/extension_uninstall_dialog.cc
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc
index d5bed37619d2d7ddc38f2f8aa34cc49e10a44350..276e818fdddec97f20bb88e584df2977aab9f4ab 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.cc
+++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -13,6 +13,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 // Size of extension icon in top left of dialog.
 static const int kIconSize = 69;
@@ -41,9 +42,9 @@ void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
                      ImageLoadingTracker::DONT_CACHE);
 }
 
-void ExtensionUninstallDialog::SetIcon(SkBitmap* image) {
+void ExtensionUninstallDialog::SetIcon(const gfx::Image* image) {
   if (image)
-    icon_ = *image;
+    icon_ = *image->ToSkBitmap();
   else
     icon_ = SkBitmap();
   if (icon_.empty()) {
@@ -57,8 +58,8 @@ void ExtensionUninstallDialog::SetIcon(SkBitmap* image) {
   }
 }
 
-void ExtensionUninstallDialog::OnImageLoaded(SkBitmap* image,
-                                             const ExtensionResource& resource,
+void ExtensionUninstallDialog::OnImageLoaded(const gfx::Image* image,
+                                             const std::string& extension_id,
                                              int index) {
   SetIcon(image);