Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Unified Diff: chrome/browser/bookmarks/bookmark_html_writer.cc

Issue 10802066: Adds support for saving favicon size into history database. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes as requested by Sky and stevenjb Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()) {
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_model.cc » ('j') | chrome/browser/bookmarks/bookmark_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698