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

extensions/browser/extension_icon_image.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_EXTENSION_ICON_IMAGE_H_
 #define EXTENSIONS_BROWSER_EXTENSION_ICON_IMAGE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/common/extension_icon_set.h"
 #include "ui/base/layout.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 class Extension;
 }
 
@@ skipping 40 matching lines @@
   // |ImageLoader| instance associated with the given context. |ImageLoader| is
   // used to perform the asynchronous image load work.
   IconImage(content::BrowserContext* context,
             const Extension* extension,
             const ExtensionIconSet& icon_set,
             int resource_size_in_dip,
             const gfx::ImageSkia& default_icon,
             Observer* observer);
   ~IconImage() override;
 
+  gfx::Image image() const { return image_; }
   const gfx::ImageSkia& image_skia() const { return image_skia_; }
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
  private:
   class Source;
 
   // Loads an image representation for the scale factor.
   // If the representation gets loaded synchronously, it is returned by this
@@ skipping 16 matching lines @@
   const int resource_size_in_dip_;
 
   ObserverList<Observer> observers_;
 
   Source* source_;  // Owned by ImageSkia storage.
   gfx::ImageSkia image_skia_;
   // The icon with whose representation |image_skia_| should be updated if
   // its own representation load fails.
   gfx::ImageSkia default_icon_;
 
+  // The image wrapper around |image_skia_|.
+  // Note: this is reset each time a new representation is loaded.
+  gfx::Image image_;
+
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<IconImage> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IconImage);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_ICON_IMAGE_H_