Accept smaller icons for the extension uninstall dialog for bookmark apps.

chrome/browser/extensions/extension_uninstall_dialog.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_uninstall_dialog.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 55 matching lines @@
   }
 }
 
 ExtensionUninstallDialog::~ExtensionUninstallDialog() {
 }
 
 void ExtensionUninstallDialog::ConfirmUninstall(
     const extensions::Extension* extension) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   extension_ = extension;
+  // Bookmark apps may not have 128x128 icons so accept 48x48 icons.
+  const int icon_size = extension_->from_bookmark()
+      ? extension_misc::EXTENSION_ICON_MEDIUM
+      : extension_misc::EXTENSION_ICON_LARGE;
   extensions::ExtensionResource image = extensions::IconsInfo::GetIconResource(
       extension_,
-      extension_misc::EXTENSION_ICON_LARGE,
+      icon_size,
       ExtensionIconSet::MATCH_BIGGER);
   // Load the icon whose pixel size is large enough to be displayed under
   // maximal supported scale factor. UI code will scale the icon down if needed.
   int pixel_size = GetSizeForMaxScaleFactor(kIconSize);
 
   // Load the image asynchronously. The response will be sent to OnImageLoaded.
   state_ = kImageIsLoading;
   extensions::ImageLoader* loader =
       extensions::ImageLoader::Get(profile_);
   loader->LoadImageAsync(extension_, image,
@@ skipping 36 matching lines @@
 
   browser_ = NULL;
   // If the browser is closed while waiting for the image, we need to send a
   // "cancel" event here, because there will not be another opportunity to
   // notify the delegate of the cancellation as we won't open the dialog.
   if (state_ == kImageIsLoading) {
     state_ = kBrowserIsClosing;
     delegate_->ExtensionUninstallCanceled();
   }
 }