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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2950563002: Fix in-document navigations breaking icons from Web Manifests (Closed)
Patch Set: Simplify test. Created 3 years, 6 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
« chrome/browser/favicon/content_favicon_driver_browsertest.cc ('K') | « chrome/test/data/favicon/pushstate_with_manifest.html ('k') | no next file » | 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 ece84e5ddac47ab7cd038887bce1a19a2ac1b1dc..09b45ef2953f4db8c4f48cb1c2a075b006127a2c 100644
--- a/components/favicon/content/content_favicon_driver.cc
+++ b/components/favicon/content/content_favicon_driver.cc
@@ -210,7 +210,9 @@ void ContentFaviconDriver::DidStartNavigation(
return;
favicon_urls_.reset();
- manifest_url_ = GURL();
+
+ if (!navigation_handle->IsSameDocument())
+ manifest_url_ = GURL();
content::ReloadType reload_type = navigation_handle->GetReloadType();
if (reload_type == content::ReloadType::NONE || IsOffTheRecord())
« chrome/browser/favicon/content_favicon_driver_browsertest.cc ('K') | « chrome/test/data/favicon/pushstate_with_manifest.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698