summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_web_ui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_web_ui.cc')
-rw-r--r--chrome/browser/extensions/extension_web_ui.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index a1f48b2..613cb5c 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -88,11 +88,13 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
}
}
- virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
- int index) {
- if (image) {
+ virtual void OnImageLoaded(const gfx::Image& image,
+ const std::string& extension_id,
+ int index) OVERRIDE {
+ if (!image.IsEmpty()) {
std::vector<unsigned char> image_data;
- if (!gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_data)) {
+ if (!gfx::PNGCodec::EncodeBGRASkBitmap(*image.ToSkBitmap(), false,
+ &image_data)) {
NOTREACHED() << "Could not encode extension favicon";
}
ForwardResult(RefCountedBytes::TakeVector(&image_data));