Allow arbitrary sizes for extension icons (and bookmark app icons)

chrome/browser/extensions/bookmark_app_helper.cc

 // Copyright 2014 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/bookmark_app_helper.h"
 
 #include <cctype>
 #include <string>
 
 #include "base/prefs/pref_service.h"
@@ skipping 417 matching lines @@
   }
   return false;
 }
 
 // static
 std::map<int, BookmarkAppHelper::BitmapAndSource>
 BookmarkAppHelper::ResizeIconsAndGenerateMissing(
     std::vector<BookmarkAppHelper::BitmapAndSource> icons,
     std::set<int> sizes_to_generate,
     WebApplicationInfo* web_app_info) {
-  // Add the downloaded icons. Extensions only allow certain icon sizes. First
-  // populate icons that match the allowed sizes exactly and then downscale
-  // remaining icons to the closest allowed size that doesn't yet have an icon.
-  std::set<int> allowed_sizes(extension_misc::kExtensionIconSizes,
-                              extension_misc::kExtensionIconSizes +
-                                  extension_misc::kNumExtensionIconSizes);
+  // Resize provided icons to make sure we have versions for each size in
+  // |sizes_to_generate|.
+  std::map<int, BitmapAndSource> resized_bitmaps(
+      ConstrainBitmapsToSizes(icons, sizes_to_generate));
 
-  // If there are icons that don't match the accepted icon sizes, find the
-  // closest bigger icon to the accepted sizes and resize the icon to it.
-  std::map<int, BitmapAndSource> resized_bitmaps(
-      ConstrainBitmapsToSizes(icons, allowed_sizes));
+  // Also add all provided icon sizes.
+  for (const BitmapAndSource& icon : icons) {
+    if (resized_bitmaps.find(icon.bitmap.width()) == resized_bitmaps.end())
+      resized_bitmaps.insert(std::make_pair(icon.bitmap.width(), icon));
+  }
 
   // Determine the color that will be used for the icon's background. For this
   // the dominant color of the first icon found is used.
   if (resized_bitmaps.size()) {
     color_utils::GridSampler sampler;
     web_app_info->generated_icon_color =
         color_utils::CalculateKMeanColorOfBitmap(
             resized_bitmaps.begin()->second.bitmap);
   }
 
@@ skipping 311 matching lines @@
   if (!extension->from_bookmark()) {
     callback.Run(WebApplicationInfo());
     return;
   }
 
   WebApplicationInfo web_app_info;
   web_app_info.app_url = AppLaunchInfo::GetLaunchWebURL(extension);
   web_app_info.title = base::UTF8ToUTF16(extension->non_localized_name());
   web_app_info.description = base::UTF8ToUTF16(extension->description());
 
+  const ExtensionIconSet& icon_set = extensions::IconsInfo::GetIcons(extension);
   std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
-  for (size_t i = 0; i < extension_misc::kNumExtensionIconSizes; ++i) {
-    int size = extension_misc::kExtensionIconSizes[i];
+  for (const auto& iter : icon_set.map()) {
+    int size = iter.first;
     extensions::ExtensionResource resource =
         extensions::IconsInfo::GetIconResource(
             extension, size, ExtensionIconSet::MATCH_EXACTLY);

[Devlin, 2015/12/07 20:37:19]

I'm pretty sure this is the same as
resource = extension->GetResource(iter->second);

[Evan Stade, 2015/12/07 20:52:48]

seems true, changed.

     if (!resource.empty()) {
       info_list.push_back(extensions::ImageLoader::ImageRepresentation(
           resource,
           extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
           gfx::Size(size, size),
           ui::SCALE_FACTOR_100P));
     }
   }
 
   extensions::ImageLoader::Get(browser_context)->LoadImageFamilyAsync(
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions