Merge 13131 - Make the throbber throb sooner after you navigate. This fixes t...

chrome/browser/tab_contents/web_contents.cc

Index: chrome/browser/tab_contents/web_contents.cc
===================================================================
--- chrome/browser/tab_contents/web_contents.cc	(revision 13559)
+++ chrome/browser/tab_contents/web_contents.cc	(working copy)
@@ -370,6 +370,10 @@
 }
 
 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();
@@ -1504,7 +1508,7 @@
   if (load_state_ == net::LOAD_STATE_READING_RESPONSE)
     SetNotWaitingForResponse();
   if (is_loading())
-    NotifyNavigationStateChanged(INVALIDATE_LOAD);
+    NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_FAVICON);
 }
 
 void WebContents::OnDidGetApplicationInfo(
@@ -2021,7 +2025,7 @@
   //  - First load in first tab: no committed nav entry + pending nav entry +
   //    pending dom ui:
   //    -> Use pending DOM UI if any.
-  // 
+  //
   //  - First load in second tab: no committed nav entry + pending nav entry +
   //    no pending DOM UI:
   //    -> Use the committed DOM UI if any.