Fix the dynamic browser action setIcon path to work with any size icon.

chrome/browser/ui/extensions/icon_with_badge_image_source.cc

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..b773b6efccb8196b66d152f97caaa03010652423 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -90,14 +90,13 @@ SkPaint* GetBadgeTextPaintSingleton() {
 }
 
 gfx::ImageSkiaRep ScaleImageSkiaRep(const gfx::ImageSkiaRep& rep,
+                                    int target_width,
                                     float target_scale) {
-  gfx::Size scaled_size =
-      gfx::ScaleToCeiledSize(rep.pixel_size(), target_scale / rep.scale());
-  return gfx::ImageSkiaRep(skia::ImageOperations::Resize(
-      rep.sk_bitmap(),
-      skia::ImageOperations::RESIZE_BEST,
-      scaled_size.width(),
-      scaled_size.height()), target_scale);
+  return gfx::ImageSkiaRep(
+      skia::ImageOperations::Resize(rep.sk_bitmap(),
+                                    skia::ImageOperations::RESIZE_BEST,
+                                    target_width, target_width),

[varkha, 2016/01/20 21:22:23]

Is it OK to use |target_width| for both dest_width and dest_height with what
could possibly be non-square images?

[Evan Stade, 2016/01/21 19:38:54]

The images *should* always be square. The API allows you to specify something
like {"19": "icon.png"}, so it assumes a square.

+      target_scale);
 }
 
 }  // namespace
@@ -129,14 +128,13 @@ 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()));
-  }
-  if (grayscale_)
+  gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
+  if (rep.scale() != canvas->image_scale()) {
+    skia.AddRepresentation(
+        ScaleImageSkiaRep(rep, skia.width(), canvas->image_scale()));
+  } if (grayscale_) {

[Devlin, 2016/01/19 22:44:40]

this if should go on a newline.

[Evan Stade, 2016/01/20 23:04:36]

Done.

     skia = gfx::ImageSkiaOperations::CreateHSLShiftedImage(skia, {-1, 0, 0.6});
+  }
 
   int x_offset = std::floor((size().width() - icon_.Width()) / 2.0);
   int y_offset = std::floor((size().height() - icon_.Height()) / 2.0);