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

chrome/browser/tabs/tab_strip_model.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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 141 matching lines @@
   ChangeSelectedContentsFrom(GetSelectedTabContents(), index, user_gesture);
 }
 
 void TabStripModel::ReplaceTabContentsAt(int index,
                                          TabContents* replacement_contents) {
   DCHECK(ContainsIndex(index));
   TabContents* old_contents = GetContentsAt(index);
   contents_data_[index]->contents = replacement_contents;
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-      TabChangedAt(replacement_contents, index));
+      TabChangedAt(replacement_contents, index, false));
 
   // Re-use the logic for selecting tabs to ensure the replacement contents is
   // shown and sized appropriately.
   if (index == selected_index_) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
         TabSelectedAt(old_contents, replacement_contents, index, false));
   }
 }
 
 void TabStripModel::MoveTabContentsAt(int index, int to_position) {
@@ skipping 35 matching lines @@
     const NavigationController* controller) const {
   int index = 0;
   TabContentsDataVector::const_iterator iter = contents_data_.begin();
   for (; iter != contents_data_.end(); ++iter, ++index) {
     if ((*iter)->contents->controller() == controller)
       return index;
   }
   return kNoTab;
 }
 
-void TabStripModel::UpdateTabContentsStateAt(int index) {
+void TabStripModel::UpdateTabContentsStateAt(int index, bool loading_only) {
   DCHECK(ContainsIndex(index));
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-      TabChangedAt(GetContentsAt(index), index));
+      TabChangedAt(GetContentsAt(index), index, loading_only));
 }
 
 void TabStripModel::CloseAllTabs() {
   // Set state so that observers can adjust their behavior to suit this
   // specific condition when CloseTabContentsAt causes a flurry of
   // Close/Detach/Select notifications to be sent.
   closing_all_ = true;
   for (int i = count() - 1; i >= 0; --i)
     CloseTabContentsAt(i);
 }
@@ skipping 353 matching lines @@
   int index = GetIndexOfTabContents(contents);
   contents_data_.at(index)->opener = opener->controller();
 }
 
 // static
 bool TabStripModel::OpenerMatches(const TabContentsData* data,
                                   const NavigationController* opener,
                                   bool use_group) {
   return data->opener == opener || (use_group && data->group == opener);
 }