diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:10:47 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 00:10:47 +0000 |
| commit | 82cd9c32cb9beb75a6562261307a957ee0096c04 (patch) | |
| tree | 043d949eb3da61b913e4fd28ea51fd36e363bc3a /chrome/browser | |
| parent | 92b102937b1405263da9a7603602c0064cfc114e (diff) | |
| download | chromium_src-82cd9c32cb9beb75a6562261307a957ee0096c04.zip chromium_src-82cd9c32cb9beb75a6562261307a957ee0096c04.tar.gz chromium_src-82cd9c32cb9beb75a6562261307a957ee0096c04.tar.bz2 | |
Don't execute a NOTREACHED in TabStrip::DestroyDraggedSourceTab if the
tab strip contains the tab but the model is closing all. Normally the
end of the animation removes the tab, but if we're closing all tabs
the animation isn't run. I was hitting this when I have more than one
window open and drag a tab in a window with a single tab and release
it.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/11294
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 47329c5..0f7a743 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -570,7 +570,8 @@ void TabStrip::DestroyDraggedSourceTab(Tab* tab) { std::vector<TabData>::iterator it = tab_data_.begin(); for (; it != tab_data_.end(); ++it) { if (it->tab == tab) { - NOTREACHED() << "Leaving in an inconsistent state!"; + if (!model_->closing_all()) + NOTREACHED() << "Leaving in an inconsistent state!"; tab_data_.erase(it); break; } |