[Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

gfx::Images cache different representations (such as NSImages), whereas
gfx::ImageSkias (as a representation themselves) do not. Prefer to use
gfx::Image in most icon code, so that these representations are cached.

BUG=452971

Review URL: https://codereview.chromium.org/882243002

Cr-Commit-Position: refs/heads/master@{#313768}

1 files changed, 7 insertions, 0 deletions

diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index 5f237ff..5ebc400 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -145,6 +145,7 @@ IconImage::IconImage(
   gfx::Size resource_size(resource_size_in_dip, resource_size_in_dip);
   source_ = new Source(this, resource_size);
   image_skia_ = gfx::ImageSkia(source_, resource_size);
+  image_ = gfx::Image(image_skia_);
 
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_REMOVED,
@@ -226,6 +227,12 @@ void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
   image_skia_.RemoveRepresentation(scale);
   image_skia_.AddRepresentation(rep);
 
+  // Update the image to use the updated image skia.
+  // It's a shame we have to do this because it means that all the other
+  // representations stored on |image_| will be deleted, but unfortunately
+  // there's no way to combine the storage of two images.
+  image_ = gfx::Image(image_skia_);
+
   FOR_EACH_OBSERVER(Observer, observers_, OnExtensionIconImageChanged(this));
 }