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

Unified Diff: components/favicon/core/favicon_driver_impl.cc

Issue 2891333002: Introduce dedicated enum value for icons from Web Manifests (Closed)
Patch Set: Put browsertest behind #if. Created 3 years, 7 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/favicon/content/content_favicon_driver.cc ('k') | components/favicon/core/favicon_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/favicon/core/favicon_driver_impl.cc
diff --git a/components/favicon/core/favicon_driver_impl.cc b/components/favicon/core/favicon_driver_impl.cc
index 545def8f27886a2ff8997d8acd3f54d2f0b2953f..891772eaab9b95326746b99e2b6f636743fd649b 100644
--- a/components/favicon/core/favicon_driver_impl.cc
+++ b/components/favicon/core/favicon_driver_impl.cc
@@ -103,12 +103,13 @@ void FaviconDriverImpl::OnUpdateCandidates(
RecordCandidateMetrics(candidates);
for (const std::unique_ptr<FaviconHandler>& handler : handlers_) {
// We feed in the Web Manifest URL (if any) to the instance handling type
- // FAVICON, because those compete which each other (i.e. manifest icons
- // override inline favicons).
- handler->OnUpdateCandidates(page_url, candidates,
- handler->icon_types() & favicon_base::FAVICON
- ? manifest_url
- : GURL::EmptyGURL());
+ // WEB_MANIFEST_ICON, because those compete which each other (i.e. manifest
+ // icons override inline touch icons).
+ handler->OnUpdateCandidates(
+ page_url, candidates,
+ handler->icon_types() & favicon_base::WEB_MANIFEST_ICON
+ ? manifest_url
+ : GURL::EmptyGURL());
}
}
« no previous file with comments | « components/favicon/content/content_favicon_driver.cc ('k') | components/favicon/core/favicon_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698