summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/web_contents.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents/web_contents.cc')
-rw-r--r--chrome/browser/tab_contents/web_contents.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index c4746a1..3ac939a 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -372,6 +372,10 @@ bool WebContents::ShouldDisplayURL() {
}
bool WebContents::ShouldDisplayFavIcon() {
+ // Always display a throbber during pending loads.
+ if (controller()->GetLastCommittedEntry() && controller()->GetPendingEntry())
+ return true;
+
DOMUI* dom_ui = GetDOMUIForCurrentState();
if (dom_ui)
return !dom_ui->hide_favicon();
@@ -1501,7 +1505,7 @@ void WebContents::LoadStateChanged(const GURL& url,
if (load_state_ == net::LOAD_STATE_READING_RESPONSE)
SetNotWaitingForResponse();
if (is_loading())
- NotifyNavigationStateChanged(INVALIDATE_LOAD);
+ NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_FAVICON);
}
void WebContents::OnDidGetApplicationInfo(