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);
-}
-
 // 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;

[tapted, 2014/05/29 05:14:28]

drive-by: This constant is used in some mac .xib (interface builder) files as
well, which might get messed up if it changes here.

What's the rationale for this change? (BUG=?) Depending what that is... you
might need to update the xib files as well.

[sashab, 2014/05/29 05:19:18]

This was feedback from a UX reviewer. The icon size should match the App Info
dialog where this dialog can be launched, which is 64x64px.

Where are these .xib files?

-
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Profile* profile,
     Browser* browser,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
       browser_(browser),
       delegate_(delegate),
       extension_(NULL),
       triggering_extension_(NULL),
       state_(kImageIsLoading),
@@ skipping 15 matching lines @@
   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/29 05:36:21]

I have a hunch that you can now change this to use 64 as well. (Even bookmark
apps should work with 64x64 [at least, it should for the latest set of bookmark
app icons]).

This means that we'll use a 64x64 icon where available whereas currently we
always use the 128x128 downscaled. However I think it's reasonable that all our
surfaces that display a 64x64 icon look the same.

   extensions::ExtensionResource image = extensions::IconsInfo::GetIconResource(
       extension_,
       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,
-                         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(0, 0),

[calamity, 2014/05/29 05:36:21]

gfx::Size()

[sashab, 2014/05/29 05:46:15]

Done.

+      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()));
 }