| 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 d433118c47d295faf37a9246915affe71217cacc..fbf02d7e51ec17aea253fab384e869eed5b0cf4f 100644
|
| --- a/chrome/browser/extensions/extension_web_ui.cc
|
| +++ b/chrome/browser/extensions/extension_web_ui.cc
|
| @@ -130,11 +130,13 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
|
| // |icon_data| may be backed by NULL. Once the result has been forwarded the
|
| // instance is deleted.
|
| void ForwardResult(scoped_refptr<base::RefCountedMemory> icon_data) {
|
| - history::FaviconData favicon;
|
| - favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
|
| - favicon.image_data = icon_data;
|
| - favicon.icon_type = history::FAVICON;
|
| - request_->ForwardResultAsync(request_->handle(), favicon);
|
| + history::FaviconData favicon_data;
|
| + favicon_data.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
|
| + favicon_data.icon_type = history::FAVICON;
|
| + history::FaviconDataElement element;
|
| + element.bitmap_data = icon_data;
|
| + favicon_data.elements.push_back(element);
|
| + request_->ForwardResultAsync(request_->handle(), favicon_data);
|
| delete this;
|
| }
|
|
|
|
|