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

Unified Diff: components/history/core/browser/history_backend.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 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
« no previous file with comments | « components/history/core/browser/BUILD.gn ('k') | components/history/core/browser/thumbnail_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/history/core/browser/history_backend.cc
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
index 5f2bd55a55640e81beb2089cf864c6710ee3d165..faf00c6db8293356065862bd9fdc5e72a72ba4c8 100644
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -1607,8 +1607,12 @@ void HistoryBackend::MergeFavicon(
bitmap_id_sizes[i].bitmap_id, base::Time::Now());
bitmap_identical = true;
} else {
+ // Expire the favicon bitmap because sync can provide incorrect
+ // |bitmap_data|. See crbug.com/474421 for more details. Expiring the
+ // favicon bitmap causes it to be redownloaded the next time that the
+ // user visits any page which uses |icon_url|.
thumbnail_db_->SetFaviconBitmap(bitmap_id_sizes[i].bitmap_id,
- bitmap_data, base::Time::Now());
+ bitmap_data, base::Time());
replaced_bitmap = true;
}
break;
« no previous file with comments | « components/history/core/browser/BUILD.gn ('k') | components/history/core/browser/thumbnail_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698