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

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

Issue 2624983002: Remove default-page favicon for interstitials (Closed)
Patch Set: Add back the blank line Created 3 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_utils.cc
diff --git a/chrome/browser/favicon/favicon_utils.cc b/chrome/browser/favicon/favicon_utils.cc
index 18c9bc53d9da0e9dc0b677a560e0c7cca278b708..f44f5a3aeb1e42910027012487264947588a7d4d 100644
--- a/chrome/browser/favicon/favicon_utils.cc
+++ b/chrome/browser/favicon/favicon_utils.cc
@@ -46,6 +46,11 @@ void CreateContentFaviconDriverForWebContents(
}
bool ShouldDisplayFavicon(content::WebContents* web_contents) {
+ // No favicon on interstitials. This check must be done first since
+ // interstitial navigations don't commit and always have a pending entry.
+ if (web_contents->ShowingInterstitialPage())
+ return false;
+
// Always display a throbber during pending loads.
const content::NavigationController& controller =
web_contents->GetController();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698