Resized the icon in the Uninstall dialog to be 64x64 px

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 "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "extensions/common/manifest_handlers/icons_handler.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"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
-// Returns pixel size under maximal scale factor for the icon whose device
-// independent size is |size_in_dip|
-int GetSizeForMaxScaleFactor(int size_in_dip) {
-  float max_scale_factor_scale = gfx::ImageSkia::GetMaxSupportedScale();
-
-  return static_cast<int>(size_in_dip * max_scale_factor_scale);
-}
+// Size of extension icon in top left of dialog.
+const int kIconSize = 64;
 
 // Returns bitmap for the default icon with size equal to the default icon's
 // pixel size under maximal supported scale factor.
 SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) {
   const gfx::ImageSkia& image = is_app ?
       extensions::util::GetDefaultAppIcon() :
       extensions::util::GetDefaultExtensionIcon();
   return image.GetRepresentation(
       gfx::ImageSkia::GetMaxSupportedScale()).sk_bitmap();
 }
 
 }  // namespace
 
-// Size of extension icon in top left of dialog.
-static const int kIconSize = 69;
-
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Profile* profile,
     Browser* browser,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
       browser_(browser),
       delegate_(delegate),
       extension_(NULL),
       triggering_extension_(NULL),
       state_(kImageIsLoading),
@@ skipping 12 matching lines @@
     const extensions::Extension* extension,
     const extensions::Extension* triggering_extension) {
   triggering_extension_ = triggering_extension;
   ConfirmUninstall(extension);
 }
 
 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;

[calamity, 2014/05/30 06:42:03]

On second thought, I think we need to keep this for the HiDPI case. We should
always use 128x128 to display consistently across all dialogs on all displays.
The 128x128 is also guaranteed to exist.

This also means you can get rid of kIconSize.

[sashab, 2014/05/30 07:20:46]

Done.

+
   extensions::ExtensionResource image = extensions::IconsInfo::GetIconResource(
       extension_,
-      icon_size,
+      kIconSize,
       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,
-                         gfx::Size(pixel_size, pixel_size),
-                         base::Bind(&ExtensionUninstallDialog::OnImageLoaded,
-                                    AsWeakPtr(),
-                                    extension_->id()));
+
+  std::vector<extensions::ImageLoader::ImageRepresentation> images_list;
+  images_list.push_back(extensions::ImageLoader::ImageRepresentation(
+      image,
+      extensions::ImageLoader::ImageRepresentation::NEVER_RESIZE,
+      gfx::Size(),
+      ui::SCALE_FACTOR_100P));
+  loader->LoadImagesAsync(extension_,
+                          images_list,
+                          base::Bind(&ExtensionUninstallDialog::OnImageLoaded,
+                                     AsWeakPtr(),
+                                     extension_->id()));
 }
 
 void ExtensionUninstallDialog::SetIcon(const gfx::Image& image) {
   if (image.IsEmpty()) {
     // 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.
     // TODO(tbarzic): We should use IconImage here and load the required bitmap
     //     lazily.
     icon_ = gfx::ImageSkia::CreateFrom1xBitmap(
@@ skipping 43 matching lines @@
 std::string ExtensionUninstallDialog::GetHeadingText() {
   if (triggering_extension_) {
     return l10n_util::GetStringFUTF8(
         IDS_EXTENSION_PROGRAMMATIC_UNINSTALL_PROMPT_HEADING,
         base::UTF8ToUTF16(triggering_extension_->name()),
         base::UTF8ToUTF16(extension_->name()));
   }
   return l10n_util::GetStringFUTF8(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
                                    base::UTF8ToUTF16(extension_->name()));
 }