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

Unified Diff: components/favicon/content/content_favicon_driver.cc

Issue 1272413002: Remove useless FaviconHandler::PageChangedSinceFaviconWasRequested() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | components/favicon/core/favicon_driver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/favicon/content/content_favicon_driver.cc
diff --git a/components/favicon/content/content_favicon_driver.cc b/components/favicon/content/content_favicon_driver.cc
index c4aa894affd32a4b92cf54a7ed393a4b8fac2b11..5d71df02da46474fa226b884d773367f998f5e66 100644
--- a/components/favicon/content/content_favicon_driver.cc
+++ b/components/favicon/content/content_favicon_driver.cc
@@ -161,11 +161,14 @@ void ContentFaviconDriver::DidUpdateFaviconURL(
// Ignore the update if there is no last committed navigation entry. This can
// occur when loading an initially blank page.
- if (!web_contents()->GetController().GetLastCommittedEntry())
+ content::NavigationEntry* entry =
+ web_contents()->GetController().GetLastCommittedEntry();
+ if (!entry)
return;
favicon_urls_ = candidates;
- OnUpdateFaviconURL(FaviconURLsFromContentFaviconURLs(candidates));
+ OnUpdateFaviconURL(entry->GetURL(),
+ FaviconURLsFromContentFaviconURLs(candidates));
}
void ContentFaviconDriver::DidStartNavigationToPendingEntry(
« no previous file with comments | « no previous file | components/favicon/core/favicon_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698