Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/views/aura/launcher/launcher_icon_loader.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/views/aura/launcher/launcher_icon_loader.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 33 matching lines @@
   map_[image_loader_->next_id()] = id;
   image_loader_->LoadImage(
       extension,
       extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,
                                  ExtensionIconSet::MATCH_BIGGER),
       gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
                 ExtensionIconSet::EXTENSION_ICON_SMALL),
       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())
     return;  // The tab has since been removed, do nothing.
 
   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(
     TabContentsWrapper* tab) {
   ExtensionService* extension_service = profile_->GetExtensionService();
   if (!extension_service)
     return NULL;
   return extension_service->GetInstalledApp(tab->web_contents()->GetURL());
 }
 
 const Extension* LauncherIconLoader::GetExtensionByID(const std::string& id) {
   ExtensionService* service = profile_->GetExtensionService();
   if (!service)
     return NULL;
   return service->GetInstalledExtension(id);
 }