summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_icon_image.cc
diff options
context:
space:
mode:
authortbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 05:53:45 +0000
committertbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 05:53:45 +0000
commit684cc6a02fb5e536a52cbccece01ef5c319252f1 (patch)
treea79b30a8b8d997a71e8e323fa10672c2497a3436 /chrome/browser/extensions/extension_icon_image.cc
parent910b34bb21c120b78aa84648d09330a415d538dc (diff)
downloadchromium_src-684cc6a02fb5e536a52cbccece01ef5c319252f1.zip
chromium_src-684cc6a02fb5e536a52cbccece01ef5c319252f1.tar.gz
chromium_src-684cc6a02fb5e536a52cbccece01ef5c319252f1.tar.bz2
Change browser/page action default icon defined in manifest to support hidpi.
To support hidpi for browser action default icons, ability to define dictionary of icon in manifest as default icons is added. Defining images of sizes 19 and 38 is allowed (other dictionary values will be ignored). The image to be painted will be determined based on screen density. Similary, for script badges, default icon is determined using 16 and 32 px icon defined in extension manifest. I have extracted actual icon loading code to extension_action_icon_factory.h/.cc, so it doesn't have to be implemented for all platform specific solutions. BUG=138025,135271 Review URL: https://chromiumcodereview.appspot.com/10905005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_icon_image.cc')
-rw-r--r--chrome/browser/extensions/extension_icon_image.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc
index 24125c4..8259861 100644
--- a/chrome/browser/extensions/extension_icon_image.cc
+++ b/chrome/browser/extensions/extension_icon_image.cc
@@ -193,7 +193,7 @@ gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
info_list.push_back(ImageLoadingTracker::ImageRepresentation(
resource,
- ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
+ ImageLoadingTracker::ImageRepresentation::ALWAYS_RESIZE,
gfx::Size(resource_size_in_dip_, resource_size_in_dip_).Scale(scale),
scale_factor));
tracker_.LoadImages(extension_, info_list, ImageLoadingTracker::DONT_CACHE);