Update UI for WebStore bundle installs.

chrome/browser/extensions/extension_install_prompt.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_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 647 matching lines @@
       show_params_(
           new ExtensionInstallPromptShowParams(profile, native_window)),
       delegate_(NULL) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ConfirmBundleInstall(
     extensions::BundleInstaller* bundle,
+    const SkBitmap* icon,
     const PermissionSet* permissions) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   bundle_ = bundle;
   custom_permissions_ = permissions;
   delegate_ = bundle;
   prompt_ = new Prompt(BUNDLE_INSTALL_PROMPT);
 
+  SetIcon(icon);
   ShowConfirmation();
 }
 
 void ExtensionInstallPrompt::ConfirmStandaloneInstall(
     Delegate* delegate,
     const Extension* extension,
     SkBitmap* icon,
     scoped_refptr<Prompt> prompt) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   extension_ = extension;
@@ skipping 139 matching lines @@
 
 void ExtensionInstallPrompt::SetIcon(const SkBitmap* image) {
   if (image)
     icon_ = *image;
   else
     icon_ = SkBitmap();
   if (icon_.empty()) {
     // Let's set default icon bitmap whose size is equal to the default icon's
     // pixel size under maximal supported scale factor. If the bitmap is larger
     // than the one we need, it will be scaled down by the ui code.
-    icon_ = GetDefaultIconBitmapForMaxScaleFactor(extension_->is_app());
+    icon_ = GetDefaultIconBitmapForMaxScaleFactor(
+        extension_ ? extension_->is_app() : false);
   }
 }
 
 void ExtensionInstallPrompt::OnImageLoaded(const gfx::Image& image) {
   SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
   ShowConfirmation();
 }
 
 void ExtensionInstallPrompt::LoadImageIfNeeded() {
   // Bundle install prompts do not have an icon.
@@ skipping 74 matching lines @@
     case RE_ENABLE_PROMPT:
     case INLINE_INSTALL_PROMPT:
     case EXTERNAL_INSTALL_PROMPT:
     case INSTALL_PROMPT:
     case LAUNCH_PROMPT:
     case POST_INSTALL_PERMISSIONS_PROMPT:
     case REMOTE_INSTALL_PROMPT:
     case REPAIR_PROMPT:
     case DELEGATED_PERMISSIONS_PROMPT: {
       prompt_->set_extension(extension_);
-      prompt_->set_icon(gfx::Image::CreateFrom1xBitmap(icon_));
       prompt_->set_delegated_username(delegated_username_);
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {
       prompt_->set_bundle(bundle_);
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
       return;
   }
+  prompt_->set_icon(gfx::Image::CreateFrom1xBitmap(icon_));
 
   g_last_prompt_type_for_tests = prompt_->type();
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_params_->WasParentDestroyed()) {
     delegate_->InstallUIAbort(false);
     return;
   }
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_);
 }