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 20137a8b9bcc75fa9a749893adfe60df374a5e32..5ce46773bded9819432967d3e511c1ea2da9b8a8 100644
--- a/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
+++ b/chrome/browser/ui/views/aura/launcher/launcher_icon_loader.cc
@@ -10,6 +10,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/gfx/image/image.h"
 
 LauncherIconLoader::LauncherIconLoader(Profile* profile,
                                        LauncherUpdater* icon_updater)
@@ -47,8 +48,8 @@ void LauncherIconLoader::FetchImage(TabContentsWrapper* tab) {
       ImageLoadingTracker::CACHE);
 }
 
-void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
-                                       const ExtensionResource& resource,
+void LauncherIconLoader::OnImageLoaded(const gfx::Image* image,
+                                       const std::string& extension_id,
                                        int index) {
   ImageLoaderIDToTabMap::iterator i = image_loader_id_to_tab_map_.find(index);
   if (i == image_loader_id_to_tab_map_.end())
@@ -56,7 +57,7 @@ void LauncherIconLoader::OnImageLoaded(SkBitmap* image,
 
   TabContentsWrapper* tab = i->second;
   image_loader_id_to_tab_map_.erase(i);
-  icon_updater_->SetAppImage(tab, image);
+  icon_updater_->SetAppImage(tab, image ? image->ToSkBitmap() : NULL);
 }
 
 void LauncherIconLoader::RemoveFromImageLoaderMap(TabContentsWrapper* tab) {