extensions/browser/extension_icon_image.cc - Issue 535373002: Move extension/app default icon into src/extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/extension_icon_image.cc

Issue 535373002: Move extension/app default icon into src/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: icon path Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: extensions/browser/extension_icon_image.cc

diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc

index 5d23b1cbb82ca6a97ba97070337f2f712deca47c..14ba2904016edd51281a38affe55faf01dddbd71 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);

« no previous file with comments | « extensions/BUILD.gn ('k') | extensions/browser/resources/extensions_browser_resources.grd » ('j') | no next file with comments »