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

chrome/browser/views/tabs/tab_renderer.cc

Index: chrome/browser/views/tabs/tab_renderer.cc
===================================================================
--- chrome/browser/views/tabs/tab_renderer.cc	(revision 13559)
+++ chrome/browser/views/tabs/tab_renderer.cc	(working copy)
@@ -236,15 +236,20 @@
   delete crash_animation_;
 }
 
-void TabRenderer::UpdateData(TabContents* contents) {
+void TabRenderer::UpdateData(TabContents* contents, bool loading_only) {
   DCHECK(contents);
-  data_.favicon = contents->GetFavIcon();
-  data_.title = UTF16ToWideHack(contents->GetTitle());
+  if (!loading_only) {
+    data_.title = UTF16ToWideHack(contents->GetTitle());
+    data_.off_the_record = contents->profile()->IsOffTheRecord();
+    data_.show_download_icon = contents->IsDownloadShelfVisible();
+    data_.crashed = contents->is_crashed();
+    data_.favicon = contents->GetFavIcon();
+  }
+
+  // Loading state also involves whether we show the favicon, since that's where
+  // we display the throbber.
   data_.loading = contents->is_loading();
-  data_.off_the_record = contents->profile()->IsOffTheRecord();
   data_.show_icon = contents->ShouldDisplayFavIcon();
-  data_.show_download_icon = contents->IsDownloadShelfVisible();
-  data_.crashed = contents->is_crashed();
 }
 
 void TabRenderer::UpdateFromModel() {