diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:20:40 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:20:40 +0000 |
| commit | 7f6814d9d54027b81a782b8f2104b886cdc9d4df (patch) | |
| tree | 0362eb5615852b6848a78bf70e16f98d81f5b32f /chrome/browser/favicon | |
| parent | c9c05b606ba6125f03d4c188241831dabb898de6 (diff) | |
| download | chromium_src-7f6814d9d54027b81a782b8f2104b886cdc9d4df.zip chromium_src-7f6814d9d54027b81a782b8f2104b886cdc9d4df.tar.gz chromium_src-7f6814d9d54027b81a782b8f2104b886cdc9d4df.tar.bz2 | |
Don't show the favicon for NTP. This was a regression in r193998.
BUG=233870
Review URL: https://codereview.chromium.org/14146009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
| -rw-r--r-- | chrome/browser/favicon/favicon_tab_helper.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 47f416d..768e950 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -13,6 +13,7 @@ #include "chrome/browser/search/search.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/url_constants.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_controller.h" @@ -90,6 +91,12 @@ bool FaviconTabHelper::ShouldDisplayFavicon() { if (controller.GetLastCommittedEntry() && controller.GetPendingEntry()) return true; + GURL url = web_contents()->GetURL(); + if (url.SchemeIs(chrome::kChromeUIScheme) && + url.host() == chrome::kChromeUINewTabHost) { + return false; + } + // No favicon on Instant New Tab Pages. if (chrome::IsInstantNTP(web_contents())) return false; |