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

chrome/browser/tab_contents/web_contents.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 352 matching lines @@
 }
 
 bool WebContents::ShouldDisplayURL() {
   DOMUI* dom_ui = GetDOMUIForCurrentState();
   if (dom_ui)
     return !dom_ui->should_hide_url();
   return true;
 }
 
 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();
   return true;
 }
 
 std::wstring WebContents::GetStatusText() const {
   if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE)
     return std::wstring();
 
@@ skipping 1114 matching lines @@
   HungRendererWarning::HideForWebContents(this);
 }
 
 void WebContents::LoadStateChanged(const GURL& url,
                                    net::LoadState load_state) {
   load_state_ = load_state;
   load_state_host_ = UTF8ToWide(url.host());
   if (load_state_ == net::LOAD_STATE_READING_RESPONSE)
     SetNotWaitingForResponse();
   if (is_loading())
-    NotifyNavigationStateChanged(INVALIDATE_LOAD);
+    NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_FAVICON);
 }
 
 void WebContents::OnDidGetApplicationInfo(
     int32 page_id,
     const webkit_glue::WebApplicationInfo& info) {
   if (pending_install_.page_id != page_id)
     return;  // The user clicked create on a separate page. Ignore this.
 
   pending_install_.callback_functor =
       new GearsCreateShortcutCallbackFunctor(this);
@@ skipping 496 matching lines @@
   //  - For subsequent new tabs, they'll get a new SiteInstance which will then
   //    get switched to the one previously associated with the new tab pages.
   //    This switching will cause the manager to commit the RVH/DOMUI. So we'll
   //    have a committed DOM UI in this case.
   //
   // This condition handles all of these cases:
   //
   //  - 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.
   //
   //  - Second navigation in any tab: committed nav entry + pending nav entry:
   //    -> Use pending DOM UI if any.
   //
   //  - Normal state with no load: committed nav entry + no pending nav entry:
   //    -> Use committed DOM UI.
   if (controller()->GetPendingEntry() &&
       (controller()->GetLastCommittedEntry() ||
        render_manager_.pending_dom_ui()))
     return render_manager_.pending_dom_ui();
   return render_manager_.dom_ui();
 }