Fix bug where icon is not displayed in extension install bubbles

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 104 matching lines @@
 
 void ExtensionInstallUI::ConfirmUninstall(Delegate* delegate,
                                           const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   delegate_ = delegate;
 
   ShowConfirmation(UNINSTALL_PROMPT);
 }
 
-void ExtensionInstallUI::OnInstallSuccess(const Extension* extension) {
+void ExtensionInstallUI::OnInstallSuccess(const Extension* extension,
+                                          SkBitmap* icon) {
+  extension_ = extension;
+  SetIcon(icon);
+
   if (extension->is_theme()) {
     ShowThemeInfoBar(previous_theme_id_, previous_use_system_theme_,
                      extension, profile_);
     return;
   }
 
   // Note that browser actions don't appear in incognito mode initially,
   // so be sure to use a normal browser window.
   Profile* profile = profile_;
   if (extension->browser_action())
@@ skipping 38 matching lines @@
 void ExtensionInstallUI::OnInstallFailure(const std::string& error) {
   DCHECK(ui_loop_ == MessageLoop::current());
 
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   platform_util::SimpleErrorBox(
       browser ? browser->window()->GetNativeHandle() : NULL,
       l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_FAILURE_TITLE),
       UTF8ToUTF16(error));
 }
 
-void ExtensionInstallUI::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+void ExtensionInstallUI::SetIcon(SkBitmap* image) {
   if (image)
     icon_ = *image;
   else
     icon_ = SkBitmap();
   if (icon_.empty()) {
     if (extension_->is_app()) {
       icon_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
           IDR_APP_DEFAULT_ICON);
     } else {
       icon_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
           IDR_EXTENSION_DEFAULT_ICON);
     }
   }
+}
+
+void ExtensionInstallUI::OnImageLoaded(
+    SkBitmap* image, ExtensionResource resource, int index) {
+  SetIcon(image);
 
   switch (prompt_type_) {
     case INSTALL_PROMPT: {
       // TODO(jcivelli): http://crbug.com/44771 We should not show an install
       //                 dialog when installing an app from the gallery.
       NotificationService* service = NotificationService::current();
       service->Notify(NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           Source<ExtensionInstallUI>(this),
           NotificationService::NoDetails());
 
@@ skipping 53 matching lines @@
           tab_contents, new_theme,
           previous_theme_id, previous_use_system_theme);
 
   if (old_delegate)
     tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
   else
     tab_contents->AddInfoBar(new_delegate);
 }
 
 void ExtensionInstallUI::ShowConfirmation(PromptType prompt_type) {
   // Load the image asynchronously. For the response, check OnImageLoaded.

[asargent_no_longer_on_chrome, 2010/12/13 18:05:11]

Would it make sense to check here if the icon was already loaded (by a call to
SetIcon), and go directly to OnImageLoaded if it is?

It doesn't look like the current code would follow this path, but I could
imagine changes in the future that might end up doing that now that you've added
the SetIcon method.

   prompt_type_ = prompt_type;
   ExtensionResource image =
       extension_->GetIconResource(Extension::EXTENSION_ICON_LARGE,
                                   ExtensionIconSet::MATCH_EXACTLY);
   tracker_.LoadImage(extension_, image,
                      gfx::Size(kIconSize, kIconSize),
                      ImageLoadingTracker::DONT_CACHE);
 }
 
 #if defined(OS_MACOSX)
@@ skipping 24 matching lines @@
     TabContents* tab_contents, const Extension* new_theme,
     const std::string& previous_theme_id, bool previous_use_system_theme) {
 #if defined(TOOLKIT_GTK)
   return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id, previous_use_system_theme);
 #else
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id);
 #endif
 }