| Index: chrome/browser/bookmarks/bookmark_html_writer.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
|
| index 014fbead7f0a38bf997e7a794887f11658cd4e12..b9c29316d1c4e69bf7e08bb2a6d83e527ea6176b 100644
|
| --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
|
| @@ -473,14 +473,15 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
|
|
|
| void BookmarkFaviconFetcher::OnFaviconDataAvailable(
|
| FaviconService::Handle handle,
|
| - history::FaviconData favicon) {
|
| + history::FaviconData favicon_data) {
|
| GURL url;
|
| if (!bookmark_urls_.empty()) {
|
| url = GURL(bookmark_urls_.front());
|
| bookmark_urls_.pop_front();
|
| }
|
| - if (favicon.is_valid() && !url.is_empty()) {
|
| - favicons_map_->insert(make_pair(url.spec(), favicon.image_data));
|
| + if (favicon_data.is_valid() && !url.is_empty()) {
|
| + favicons_map_->insert(
|
| + make_pair(url.spec(), favicon_data.elements[0].bitmap_data));
|
| }
|
|
|
| if (FetchNextFavicon()) {
|
|
|