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

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

 // Copyright (c) 2011 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/ui/views/tabs/tab_strip.h"
 
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
@@ skipping 950 matching lines @@
   AnimateToIdealBounds();
 }
 
 void TabStrip::StartMouseInitiatedRemoveTabAnimation(int model_index) {
   // The user initiated the close. We want to persist the bounds of all the
   // existing tabs, so we manually shift ideal_bounds then animate.
   int tab_data_index = ModelIndexToTabIndex(model_index);
   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_;
   }
 
   for (int i = tab_data_index + 1; i < tab_count(); ++i) {
     BaseTab* tab = base_tab_at_tab_index(i);
     if (!tab->closing()) {
       gfx::Rect bounds = ideal_bounds(i);
       bounds.set_x(bounds.x() - delta);
       set_ideal_bounds(i, bounds);
     }
@@ skipping 32 matching lines @@
   }
   return mini_count;
 }
 
 bool TabStrip::IsPointInTab(Tab* tab,
                             const gfx::Point& point_in_tabstrip_coords) {
   gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
   View::ConvertPointToView(this, tab, &point_in_tab_coords);
   return tab->HitTest(point_in_tab_coords);
 }