diff options
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 2e42a64..3b0c4bb 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -533,7 +533,7 @@ bool TabStripModel::InternalCloseTabContentsAt(int index, // them. Once they have fired, we'll get a message back saying whether // to proceed closing the page or not, which sends us back to this method // with the HasUnloadListener bit cleared. - WebContents* web_contents = GetContentsAt(index)->AsWebContents(); + WebContents* web_contents = detached_contents->AsWebContents(); // If we hit this code path, the tab had better be a WebContents tab. DCHECK(web_contents); web_contents->render_view_host()->FirePageBeforeUnload(); diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 3232ec4..7791289 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1470,8 +1470,17 @@ void TabStrip::StartResizeLayoutAnimation() { } 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)); |