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"
 #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)
     : profile_(profile),
       icon_updater_(icon_updater) {
 }
 
 LauncherIconLoader::~LauncherIconLoader() {
 }
 
@@ skipping 17 matching lines @@
   const Extension* extension = GetExtensionForTab(tab);
   image_loader_->LoadImage(
       extension,
       extension->GetIconResource(Extension::EXTENSION_ICON_SMALL,
                                  ExtensionIconSet::MATCH_BIGGER),
       gfx::Size(Extension::EXTENSION_ICON_SMALL,
                 Extension::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) {
   ImageLoaderIDToTabMap::iterator i = image_loader_id_to_tab_map_.find(index);
   if (i == image_loader_id_to_tab_map_.end())
     return;  // The tab has since been removed, do nothing.
 
   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) {
   for (ImageLoaderIDToTabMap::iterator i = image_loader_id_to_tab_map_.begin();
        i != image_loader_id_to_tab_map_.end(); ++i) {
     if (i->second == tab) {
       image_loader_id_to_tab_map_.erase(i);
       break;
     }
   }
 }
 
 const Extension* LauncherIconLoader::GetExtensionForTab(
     TabContentsWrapper* tab) {
   ExtensionService* extension_service = profile_->GetExtensionService();
   if (!extension_service)
     return NULL;
   return extension_service->GetInstalledApp(tab->web_contents()->GetURL());
 }