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

Unified Diff: chrome/browser/favicon/favicon_tab_helper.cc

Issue 64853004: Use high resolution icons where possible for streamlined hosted app icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@browser_experiment_create_app_from_page
Patch Set: move favicon_downloader* to c/b/extensions Created 7 years 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/favicon/favicon_tab_helper.cc
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index a3d5fa7a5115bf0a63a3a05c5e35ca2a2eda9ec5..d7fd3cd112df9035f0a0a91ec443eb5fa005e8c5 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -175,6 +175,7 @@ void FaviconTabHelper::NavigateToPendingEntry(
void FaviconTabHelper::DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) {
+ favicon_urls_.clear();
// Get the favicon, either from history or request it from the net.
FetchFavicon(details.entry->GetURL());
}
@@ -182,6 +183,9 @@ void FaviconTabHelper::DidNavigateMainFrame(
void FaviconTabHelper::DidUpdateFaviconURL(
int32 page_id,
const std::vector<content::FaviconURL>& candidates) {
+ DCHECK(!candidates.empty());
+ favicon_urls_ = candidates;
+
favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
if (touch_icon_handler_.get())
touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates);

Powered by Google App Engine
This is Rietveld 408576698