| Index: content/browser/webui/web_ui_factory.cc
|
| diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
|
| index e278fef94b64a6e5ad894d5b10a6deeb30784445..a477337185cc1681ad558d2180549c040afec4ae 100644
|
| --- a/content/browser/webui/web_ui_factory.cc
|
| +++ b/content/browser/webui/web_ui_factory.cc
|
| @@ -290,12 +290,14 @@ void WebUIFactory::GetFaviconForURL(Profile* profile,
|
| page_url.host() != extension_misc::kBookmarkManagerId) {
|
| ExtensionWebUI::GetFaviconForURL(profile, request, page_url);
|
| } else {
|
| - scoped_refptr<RefCountedMemory> icon_data(
|
| + FaviconService::FaviconData favicon;
|
| + favicon.image_data = scoped_refptr<RefCountedMemory>(
|
| WebUIFactory::GetFaviconResourceBytes(profile, page_url));
|
| - bool know_icon = icon_data.get() != NULL && icon_data->size() > 0;
|
| + favicon.known_icon = favicon.image_data.get() != NULL &&
|
| + favicon.image_data->size() > 0;
|
| request->ForwardResultAsync(
|
| FaviconService::FaviconDataCallback::TupleType(request->handle(),
|
| - know_icon, icon_data, false, GURL()));
|
| + favicon));
|
| }
|
| }
|
|
|
|
|