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

chrome/browser/gtk/tabs/tab_strip_gtk.cc

 // Copyright (c) 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/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "app/gtk_dnd_util.h"
 #include "app/gfx/canvas_paint.h"
@@ skipping 997 matching lines @@
   } else {
     GenerateIdealBounds();
     StartMoveTabAnimation(from_index, to_index);
   }
 }
 
 void TabStripGtk::TabChangedAt(TabContents* contents, int index,
                                bool loading_only) {
   // Index is in terms of the model. Need to make sure we adjust that index in
   // case we have an animation going.
-  TabGtk* tab = GetTabAt(index);
+  TabGtk* tab = GetTabAtAdjustForAnimation(index);
   tab->UpdateData(contents, loading_only);
   tab->UpdateFromModel();
 }
 
 void TabStripGtk::TabPinnedStateChanged(TabContents* contents, int index) {
   GetTabAt(index)->set_pinned(model_->IsTabPinned(index));
   StartPinnedTabAnimation(index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 177 matching lines @@
   }
   return -1;
 }
 
 TabGtk* TabStripGtk::GetTabAt(int index) const {
   DCHECK_GE(index, 0);
   DCHECK_LT(index, GetTabCount());
   return tab_data_.at(index).tab;
 }
 
+TabGtk* TabStripGtk::GetTabAtAdjustForAnimation(int index) const {
+  if (active_animation_.get() &&
+      active_animation_->type() == TabAnimation::REMOVE &&
+      index >=
+      static_cast<RemoveTabAnimation*>(active_animation_.get())->index()) {
+    index++;
+  }
+  return GetTabAt(index);
+}
+
 void TabStripGtk::RemoveTabAt(int index) {
   TabGtk* removed = tab_data_.at(index).tab;
 
   // Remove the Tab from the TabStrip's list.
   tab_data_.erase(tab_data_.begin() + index);
 
   if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) {
     gtk_container_remove(GTK_CONTAINER(tabstrip_.get()), removed->widget());
     delete removed;
   }
@@ skipping 794 matching lines @@
 
   // Let the middle mouse button initiate clicks as well.
   gtk_util::SetButtonTriggersNavigation(button->widget());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnNewTabClicked), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0);
 
   return button;
 }