summaryrefslogtreecommitdiffstats
path: root/extensions/browser/extension_icon_image.cc
diff options
context:
space:
mode:
authorgpdavis.chromium@gmail.com <gpdavis.chromium@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 17:42:31 +0000
committergpdavis.chromium@gmail.com <gpdavis.chromium@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 17:43:31 +0000
commit9cfffade2b96158d0071efe3ee812a5863d07660 (patch)
tree2949bc86711c12c487bed01f327c2a0b447ea512 /extensions/browser/extension_icon_image.cc
parent8b38bcfe379ceebb9a8dafa920b61767af7e9d75 (diff)
downloadchromium_src-9cfffade2b96158d0071efe3ee812a5863d07660.zip
chromium_src-9cfffade2b96158d0071efe3ee812a5863d07660.tar.gz
chromium_src-9cfffade2b96158d0071efe3ee812a5863d07660.tar.bz2
Fix issue with action icons not downscaling
BUG=404203 Review URL: https://codereview.chromium.org/475993002 Cr-Commit-Position: refs/heads/master@{#290605} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/extension_icon_image.cc')
-rw-r--r--extensions/browser/extension_icon_image.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index a70924d..14ba290 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -40,8 +40,6 @@
namespace {
-const int kMatchBiggerTreshold = 32;
-
extensions::ExtensionResource GetExtensionIconResource(
const extensions::Extension* extension,
const ExtensionIconSet& icons,
@@ -169,11 +167,10 @@ gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
extensions::ExtensionResource resource;
// Find extension resource for non bundled component extensions.
- // We try loading bigger image only if resource size is >= 32.
- if (resource_size_in_pixel >= kMatchBiggerTreshold) {
- resource = GetExtensionIconResource(extension_, icon_set_,
- resource_size_in_pixel, ExtensionIconSet::MATCH_BIGGER);
- }
+ resource = GetExtensionIconResource(extension_,
+ icon_set_,
+ resource_size_in_pixel,
+ ExtensionIconSet::MATCH_BIGGER);
// If resource is not found by now, try matching smaller one.
if (resource.empty()) {