Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/extension_install_ui.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/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 23 matching lines @@
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 using content::WebContents;
 using extensions::BundleInstaller;
 
 static const int kTitleIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   0,  // The regular install prompt depends on what's being installed.
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
   IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE
@@ skipping 262 matching lines @@
   if (disable_failure_ui_for_tests || skip_post_install_ui_)
     return;
 
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   browser::ShowErrorBox(
       browser ? browser->window()->GetNativeHandle() : NULL,
       l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_FAILURE_TITLE),
       error);
 }
 
-void ExtensionInstallUI::SetIcon(SkBitmap* image) {
+void ExtensionInstallUI::SetIcon(const SkBitmap* image) {
   if (image)
     icon_ = *image;
   else
     icon_ = SkBitmap();
   if (icon_.empty())
     icon_ = Extension::GetDefaultIcon(extension_->is_app());
 }
 
-void ExtensionInstallUI::OnImageLoaded(
-    SkBitmap* image, const ExtensionResource& resource, int index) {
-  SetIcon(image);
+void ExtensionInstallUI::OnImageLoaded(const gfx::Image& image,
+                                       const std::string& extension_id,
+                                       int index) {
+  SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
 
   switch (prompt_type_) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INSTALL_PROMPT: {
       content::NotificationService* service =
           content::NotificationService::current();
       service->Notify(chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           content::Source<ExtensionInstallUI>(this),
           content::NotificationService::NoDetails());
@@ skipping 91 matching lines @@
     bool previous_using_native_theme) {
   Profile* profile = tab_contents->profile();
   return new ThemeInstalledInfoBarDelegate(
       tab_contents->infobar_tab_helper(),
       profile->GetExtensionService(),
       ThemeServiceFactory::GetForProfile(profile),
       new_theme,
       previous_theme_id,
       previous_using_native_theme);
 }