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 ImageWithBadgeSource : public gfx::CanvasImageSource {
+ public:
+  ImageWithBadgeSource(const ImageSkia& first, const ImageSkia& second)
+      : gfx::CanvasImageSource(first.size(), false /* is opaque */),
+        first_(first),
+        second_(second) {}
+
+  ~ImageWithBadgeSource() override {}
+
+  // gfx::CanvasImageSource override.
+  void Draw(Canvas* canvas) override {
+    canvas->DrawImageInt(first_, 0, 0);
+    canvas->DrawImageInt(second_, (first_.width() - second_.width()),
+                         (first_.height() - second_.height()));
+  }
+
+ private:
+  const ImageSkia first_;
+  const ImageSkia second_;
+
+  DISALLOW_COPY_AND_ASSIGN(ImageWithBadgeSource);
+};
 
 }  // 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::CreateImageWithBadge(const ImageSkia& first,
+                                                    const ImageSkia& second) {
+  if (first.isNull() || second.isNull())
+    return ImageSkia();

[stevenjb, 2016/08/08 22:26:46]

It seems reasonable that if 'first' (the icon) is valid but second is not, we
should return 'first' instead of an empty image? Either way we should document
the behavior in the header.

[Andra Paraschiv, 2016/08/09 11:34:47]

Yes, we could do this way. Also, should we return the badge icon as a default
icon if the first icon is not valid? Added this logic in the new patch set.

[Reilly Grant (use Gerrit), 2016/08/09 19:08:45]

If the icon is not yet available we should use the default placeholder app icon
and badge it with the icon of the app that created the window.

[Andra Paraschiv, 2016/08/10 14:19:57]

Done.

+
+  return ImageSkia(new ImageWithBadgeSource(first, second), first.size());
+}
+
 }  // namespace gfx