GTK: fix tabstrip index misalignment during tab removal....

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
@@ skipping 2473 matching lines @@
 
     // Updating the URL happens synchronously in ScheduleUIUpdate.
     TabContents* selected_tab = GetSelectedTabContents();
     if (selected_tab &&
         flags & TabContents::INVALIDATE_LOAD && GetStatusBubble()) {
       GetStatusBubble()->SetStatus(selected_tab->GetStatusText());
     }
 
     if (flags & TabContents::INVALIDATE_TAB) {
       tabstrip_model_.UpdateTabContentsStateAt(
-          tabstrip_model_.GetIndexOfController(&contents->controller()), false);
+          tabstrip_model_.GetIndexOfTabContents(contents), false);
       window_->UpdateTitleBar();
 
       if (selected_tab && contents == selected_tab) {
         command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
             !selected_tab->GetFavIcon().isNull());
       }
     }
 
     // We don't need to process INVALIDATE_STATE, since that's not visible.
   }
@@ skipping 386 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }