Fix for Issue 3258: Tabs created when tabstrip is compressed pending resize r...

chrome/browser/views/tabs/tab_strip.cc

 // Copyright (c) 2006-2008 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/views/tabs/tab_strip.h"
 
 #include "base/gfx/size.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents.h"
@@ skipping 1452 matching lines @@
 }
 
 void TabStrip::StartResizeLayoutAnimation() {
   if (active_animation_.get())
     active_animation_->Stop();
   active_animation_.reset(new ResizeLayoutAnimation(this));
   active_animation_->Start();
 }
 
 void TabStrip::StartInsertTabAnimation(int index) {
-  // The TabStrip can now use its entire width to lay out Tabs.
-  available_width_for_tabs_ = -1;
+  // Don't shock users by letting all tabs move when they are focused
+  // on the tab-strip. Wait for later, when they aren't looking.
+  int last_tab_index = GetTabCount() - 2;
+  if (last_tab_index > 0) {
+    Tab* last_tab = GetTabAt(last_tab_index);
+          available_width_for_tabs_ = std::min(
+                  GetAvailableWidthForTabs(last_tab) + last_tab->width(),
+                  width() - (kNewTabButtonHOffset + newtab_button_size_.width()));
+  } else {
+    available_width_for_tabs_ = -1;
+  }
   if (active_animation_.get())
     active_animation_->Stop();
   active_animation_.reset(new InsertTabAnimation(this, index));
   active_animation_->Start();
 }
 
 void TabStrip::StartRemoveTabAnimation(int index, TabContents* contents) {
   if (active_animation_.get()) {
     // Some animations (e.g. MoveTabAnimation) cause there to be a Layout when
     // they're completed (which includes canceled). Since |tab_data_| is now
@@ skipping 48 matching lines @@
   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);
 }