Changed StartMouseInitiatedRemoveTabAnimation to use tab data indices rather than Model indices w...

chrome/browser/ui/views/tabs/tab_strip.cc

Index: chrome/browser/ui/views/tabs/tab_strip.cc
===================================================================
--- chrome/browser/ui/views/tabs/tab_strip.cc	(revision 91577)
+++ chrome/browser/ui/views/tabs/tab_strip.cc	(working copy)
@@ -968,8 +968,11 @@
   DCHECK(tab_data_index != tab_count());
   BaseTab* tab_closing = base_tab_at_tab_index(tab_data_index);
   int delta = tab_closing->width() + kTabHOffset;
-  if (tab_closing->data().mini && model_index + 1 < GetModelCount() &&
-      !GetBaseTabAtModelIndex(model_index + 1)->data().mini) {
+  // If the tab being closed is a mini-tab next to a non-mini-tab, be sure to
+  // add the extra padding.
+  int next_tab_data_index = ModelIndexToTabIndex(model_index + 1);
+  if (tab_closing->data().mini && next_tab_data_index < tab_count() &&

[sky, 2011/07/06 20:54:56]

Insert:
DCHECK_NE(next_tab_index, tab_count())
between 973 and 974. 

+      !base_tab_at_tab_index(next_tab_data_index)->data().mini) {
     delta += mini_to_non_mini_gap_;
   }