Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc

Index: chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
diff --git a/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc b/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
index 0d82d21b7059a40b45219182cfed62c389fdc10a..767b2e229d03ed044b755ffddf50d9f437474c30 100644
--- a/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
+++ b/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
@@ -51,8 +51,8 @@ void LauncherIconLoader::FetchImage(const std::string& id) {
       ImageLoadingTracker::CACHE);
 }
 
-void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
-                                       const ExtensionResource& resource,
+void LauncherIconLoader::OnImageLoaded(const gfx::Image& image,
+                                       const std::string& extension_id,
                                        int index) {
   ImageLoaderIDToExtensionIDMap::iterator i = map_.find(index);
   if (i == map_.end())
@@ -60,7 +60,10 @@ void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
 
   std::string id = i->second;
   map_.erase(i);
-  host_->SetAppImage(id, image);
+  if (image.IsEmpty())
+    host_->SetAppImage(id, NULL);
+  else
+    host_->SetAppImage(id, image.ToSkBitmap());
 }
 
 const Extension* LauncherIconLoader::GetExtensionForTab(