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

Unified Diff: chrome/browser/history/android/android_provider_backend.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/history/android/android_provider_backend.cc
diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc
index fec1cdbcb2a341d4964d7c954483ef25976afc9b..847a6c5d33cfbd8493823adba6a0970973a59e58 100644
--- a/chrome/browser/history/android/android_provider_backend.cc
+++ b/chrome/browser/history/android/android_provider_backend.cc
@@ -966,11 +966,11 @@ bool AndroidProviderBackend::SimulateUpdateURL(
FaviconID favicon_id = statement->statement()->ColumnInt64(4);
if (favicon_id) {
- std::vector<unsigned char> favicon;
- if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon, NULL, NULL))
+ std::vector<FaviconBitmap> favicon_bitmaps;
+ if (!thumbnail_db_->GetFavicons(favicon_id, &favicon_bitmaps))
return false;
- if (!favicon.empty())
- new_row.set_favicon(favicon);
+ if (favicon_bitmaps[0].bitmap_data->size() > 0)
+ new_row.set_favicon(favicon_bitmaps[0].bitmap_data);
favicon_details->urls.insert(old_url_row.url());
favicon_details->urls.insert(row.url());
}

Powered by Google App Engine
This is Rietveld 408576698