summaryrefslogtreecommitdiffstats
path: root/extensions/browser/extension_icon_image.cc
diff options
context:
space:
mode:
authormukai <mukai@chromium.org>2014-09-05 10:40:51 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-05 17:45:22 +0000
commit4245dfe8b5f0f73c96b3cd25547b9e9b570f4221 (patch)
tree4670edbe71474e966a45f07660921b667e295068 /extensions/browser/extension_icon_image.cc
parentb864d8b8a8d837bb844f6ac2de64ad4fd0899881 (diff)
downloadchromium_src-4245dfe8b5f0f73c96b3cd25547b9e9b570f4221.zip
chromium_src-4245dfe8b5f0f73c96b3cd25547b9e9b570f4221.tar.gz
chromium_src-4245dfe8b5f0f73c96b3cd25547b9e9b570f4221.tar.bz2
Move extension/app default icon into src/extensions
BUG=407777 R=yoz@chromium.org, oshima@chromium.org, sky@chromium.org TEST=manually Review URL: https://codereview.chromium.org/535373002 Cr-Commit-Position: refs/heads/master@{#293549}
Diffstat (limited to 'extensions/browser/extension_icon_image.cc')
-rw-r--r--extensions/browser/extension_icon_image.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index 5d23b1c..14ba290 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -210,11 +210,7 @@ void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
DCHECK(!rep.is_null());
-#if !defined(USE_ATHENA)
- // TODO(oshima): It someshow gets 2x image for 1x for some extensions. Fix
- // this.
DCHECK_EQ(scale, rep.scale());
-#endif
// Remove old representation if there is one.
image_skia_.RemoveRepresentation(scale);