Fix a crash on tab closure. We now use our own model data and check that the...

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/tab_contents/tab_contents.h"
@@ skipping 417 matching lines @@
 // static
 gboolean TabStripGtk::OnMotionNotify(GtkWidget* widget, GdkEventMotion* event,
                                      TabStripGtk* tabstrip) {
   int old_hover_index = tabstrip->hover_index_;
   tabstrip->hover_index_ = -1;
 
   gfx::Point coord(event->x, event->y);
   // Get a rough estimate for which tab the mouse is over.
   int index = event->x / (tabstrip->current_unselected_width_ + kTabHOffset);
 
-  if (index >= tabstrip->model_->count()) {
-    if (old_hover_index != -1) {
+  int tab_count = tabstrip->GetTabCount();
+  if (index >= tab_count) {
+    if (old_hover_index != -1 && old_hover_index < tab_count) {
       tabstrip->GetTabAt(old_hover_index)->SetHovering(false);
       gtk_widget_queue_draw(tabstrip->tabstrip_.get());
     }
 
     return TRUE;
   }
 
   // Tab hovering calcuation.
   // Using the rough estimate tab index, we check the tab bounds in a smart
   // order to reduce the number of tabs we need to check.  If the tab at the
   // estimated index is selected, check it first as it covers both tabs below
   // it.  Otherwise, check the tab to the left, then the estimated tab, and
   // finally the tab to the right (tabs stack to the left.)
 
   if (tabstrip->model()->selected_index() == index &&
       tabstrip->GetTabAt(index)->IsPointInBounds(coord)) {
     tabstrip->hover_index_ = index;
   } else if (index > 0 &&
              tabstrip->GetTabAt(index - 1)->IsPointInBounds(coord)) {
     tabstrip->hover_index_ = index - 1;
   } else if (tabstrip->model()->selected_index() != index &&
              tabstrip->GetTabAt(index)->IsPointInBounds(coord)) {
     tabstrip->hover_index_ = index;
-  } else if (index < tabstrip->model_->count() - 1 &&
+  } else if (index < tab_count - 1 &&
              tabstrip->GetTabAt(index + 1)->IsPointInBounds(coord)) {
     tabstrip->hover_index_ = index + 1;
   }
 
   // Nothing to do if the indexes are the same.
   if (tabstrip->hover_index_ != old_hover_index) {
     if (tabstrip->hover_index_ != -1)
       tabstrip->GetTabAt(tabstrip->hover_index_)->SetHovering(true);
 
-    if (old_hover_index != -1)
+    if (old_hover_index != -1 && old_hover_index < tab_count)
       tabstrip->GetTabAt(old_hover_index)->SetHovering(false);
 
     gtk_widget_queue_draw(tabstrip->tabstrip_.get());
   }
 
   return TRUE;
 }
 
 // static
 gboolean TabStripGtk::OnButtonPress(GtkWidget* widget, GdkEventButton* event,
@@ skipping 13 matching lines @@
   // GDK_CROSSING_GRAB.  Ignore this event because it doesn't meant the mouse
   // has left the tabstrip.
   if (tabstrip->hover_index_ != -1 && event->mode != GDK_CROSSING_GRAB) {
     tabstrip->GetTabAt(tabstrip->hover_index_)->SetHovering(false);
     tabstrip->hover_index_ = -1;
     gtk_widget_queue_draw(tabstrip->tabstrip_.get());
   }
 
   return TRUE;
 }