Fix the case where a previous tab is closing and the mouse is pressed on a ta...

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 "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/tabs/tab_button_gtk.h"
@@ skipping 1161 matching lines @@
 
   if (paint)
     gtk_widget_queue_draw(tabstrip->tabstrip_.get());
 
   return TRUE;
 }
 
 // static
 gboolean TabStripGtk::OnMousePress(GtkWidget* widget, GdkEventButton* event,
                                    TabStripGtk* tabstrip) {
+  gfx::Point point(event->x, event->y);
+
   // Nothing happens on mouse press for middle and right click.
   if (event->button != 1)
     return TRUE;
 
-  gfx::Point point(event->x, event->y);
+  // The hover index is stale if we're in the middle of an animation and the
+  // mouse is pressed without any movement.
+  if (tabstrip->active_animation_.get())
+    tabstrip->hover_index_ = tabstrip->FindTabHoverIndexIterative(point);
+
   if (tabstrip->hover_index_ == -1) {
     if (tabstrip->newtab_button_.get()->IsPointInBounds(point) &&
         tabstrip->newtab_button_.get()->OnMousePress())
       gtk_widget_queue_draw(tabstrip->tabstrip_.get());
 
     return TRUE;
   }
 
   TabGtk* tab = tabstrip->GetTabAt(tabstrip->hover_index_);
+
+  // If a previous tab is closing, the hover index does not match the model
+  // index.
+  tabstrip->hover_index_ = tabstrip->GetIndexOfTab(tab);
+
   if (tab->OnMousePress(point)) {
     gtk_widget_queue_draw(tabstrip->tabstrip_.get());
   } else if (tabstrip->hover_index_ != tabstrip->model()->selected_index() &&
              !tab->closing()) {
     tabstrip->model()->SelectTabContentsAt(tabstrip->hover_index_, true);
   }
 
   return TRUE;
 }
 
@@ skipping 250 matching lines @@
   return TabStripModel::kNoTab;
 }
 
 int TabStripGtk::NormalizeIndexToAttachedTabStrip(int index) {
   if (index >= model_->count())
     return model_->count() - 1;
   if (index == TabStripModel::kNoTab)
     return 0;
   return index;
 }