Fixes bug where closing a pinned tab followed by dragging a tab could

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 "base/compiler_specific.h"
 #include "base/stl_util-inl.h"
@@ skipping 196 matching lines @@
     // ideal bounds and we need to know ideal bounds is in a good state.
     StopAnimating(true);
   }
 
   int model_count = GetModelCount();
   if (model_index + 1 != model_count && model_count > 1) {
     // The user is about to close a tab other than the last tab. Set
     // available_width_for_tabs_ so that if we do a layout we don't position a
     // tab past the end of the second to last tab. We do this so that as the
     // user closes tabs with the mouse a tab continues to fall under the mouse.
-    available_width_for_tabs_ = GetAvailableWidthForTabs(
-        GetTabAtModelIndex(model_count - 2));
+    Tab* last_tab = GetTabAtModelIndex(model_count - 1);
+    Tab* tab_being_removed = GetTabAtModelIndex(model_index);
+    available_width_for_tabs_ = last_tab->x() + last_tab->width() -
+        tab_being_removed->width() - kTabHOffset;
+    if (model_index == 0 && tab_being_removed->data().mini &&
+        !GetTabAtModelIndex(1)->data().mini) {
+      available_width_for_tabs_ -= mini_to_non_mini_gap_;
+    }
   }
 
   in_tab_close_ = true;
   AddMessageLoopObserver();
 }
 
 void TabStrip::RemoveTabAt(int model_index) {
   if (in_tab_close_ && model_index != GetModelCount())
     StartMouseInitiatedRemoveTabAnimation(model_index);
   else
@@ skipping 760 matching lines @@
   int mini_count = 0;
   for (int i = 0; i < tab_count(); ++i) {
     if (base_tab_at_tab_index(i)->data().mini)
       mini_count++;
     else
       return mini_count;
   }
   return mini_count;
 }
 
-int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const {
-  return last_tab->x() + last_tab->width();
-}
-
 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);
 }