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

extensions/browser/extension_icon_image.cc

 // Copyright 2014 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 "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 127 matching lines @@
       default_icon_(gfx::ImageSkiaOperations::CreateResizedImage(
           default_icon,
           skia::ImageOperations::RESIZE_BEST,
           gfx::Size(resource_size_in_dip, resource_size_in_dip))),
       weak_ptr_factory_(this) {
   if (observer)
     AddObserver(observer);
   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,
                  content::NotificationService::AllSources());
 }
 
 void IconImage::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 61 matching lines @@
     return;
 
   gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
   DCHECK(!rep.is_null());
   DCHECK_EQ(scale, rep.scale());
 
   // Remove old representation if there is one.
   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));
 }
 
 void IconImage::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions