| Index: chrome/browser/extensions/extension_web_ui.cc
|
| diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
|
| index a1f48b24a41b889058078984a6d7d51b49d555d7..613cb5cd48114ec11750d4f4f4ef43f867e412ed 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));
|
|
|