Enhance chrome.app.window API with icon property

ui/gfx/image/image_skia_operations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/image/image_skia_operations.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 405 matching lines @@
     return ImageSkiaRep(rotated_bitmap, image_rep.scale());
   }
 
  private:
   const ImageSkia source_;
   const SkBitmapOperations::RotationAmount rotation_;
 
   DISALLOW_COPY_AND_ASSIGN(RotatedSource);
 };
 
+class IconWithBadgeSource : public gfx::CanvasImageSource {
+ public:
+  IconWithBadgeSource(const ImageSkia& icon, const ImageSkia& badge)
+      : gfx::CanvasImageSource(icon.size(), false /* is opaque */),
+        icon_(icon),
+        badge_(badge) {}
+
+  ~IconWithBadgeSource() override {}
+
+  // gfx::CanvasImageSource override.
+  void Draw(Canvas* canvas) override {
+    canvas->DrawImageInt(icon_, 0, 0);
+    canvas->DrawImageInt(badge_, (icon_.width() - badge_.width()),
+                         (icon_.height() - badge_.height()));
+  }
+
+ private:
+  const ImageSkia icon_;
+  const ImageSkia badge_;
+
+  DISALLOW_COPY_AND_ASSIGN(IconWithBadgeSource);
+};
 
 }  // namespace
 
 // static
 ImageSkia ImageSkiaOperations::CreateBlendedImage(const ImageSkia& first,
                                                   const ImageSkia& second,
                                                   double alpha) {
   if (first.isNull() || second.isNull())
     return ImageSkia();
 
@@ skipping 105 matching lines @@
   if (source.isNull())
     return ImageSkia();
 
   return ImageSkia(new RotatedSource(source, rotation),
       SkBitmapOperations::ROTATION_180_CW == rotation ?
           source.size() :
           gfx::Size(source.height(), source.width()));
 
 }
 
+// static
+ImageSkia ImageSkiaOperations::CreateIconWithBadge(const ImageSkia& icon,
+                                                   const ImageSkia& badge) {
+  if (icon.isNull())
+    return ImageSkia();
+
+  if (!icon.isNull() && badge.isNull())

[stevenjb, 2016/08/10 16:58:48]

This can just be if (badge.isNull())

[Andra Paraschiv, 2016/08/11 07:20:55]

Done.

+    return icon;
+
+  return ImageSkia(new IconWithBadgeSource(icon, badge), icon.size());
+}
+
 }  // namespace gfx