Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Unified Diff: chrome/browser/ui/extensions/icon_with_badge_image_source.cc

Issue 1580983002: Fix the dynamic browser action setIcon path to work with any size icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/extensions/icon_with_badge_image_source.cc
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
index 322dcce754393993d52697e5b51d0e816e847550..ad371125d3e88b135c1ecddadf48ced63a3dd17f 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -129,12 +129,9 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
return;
gfx::ImageSkia skia = icon_.AsImageSkia();
- // TODO(estade): Fix setIcon and enable this on !MD.
- if (ui::MaterialDesignController::IsModeMaterial()) {
- gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
- if (rep.scale() != canvas->image_scale())
- skia.AddRepresentation(ScaleImageSkiaRep(rep, canvas->image_scale()));
- }
+ gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
+ if (rep.scale() != canvas->image_scale())
+ skia.AddRepresentation(ScaleImageSkiaRep(rep, canvas->image_scale()));
if (grayscale_)
skia = gfx::ImageSkiaOperations::CreateHSLShiftedImage(skia, {-1, 0, 0.6});

Powered by Google App Engine
This is Rietveld 408576698