diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 01:42:58 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 01:42:58 +0000 |
| commit | 7eaf9048f438fea08ffd9fdcf9afdf28c6d1b4f7 (patch) | |
| tree | 46a9adb1c285ddd03586c6d9bf693c36fa34703f /chrome/browser | |
| parent | 856080bd99e86a1eb6f1eb034f65657d03d1f095 (diff) | |
| download | chromium_src-7eaf9048f438fea08ffd9fdcf9afdf28c6d1b4f7.zip chromium_src-7eaf9048f438fea08ffd9fdcf9afdf28c6d1b4f7.tar.gz chromium_src-7eaf9048f438fea08ffd9fdcf9afdf28c6d1b4f7.tar.bz2 | |
Have CommandCloseTabsOpenedBy iterate through the tabs in reverse order to avoid race conditions with tab closing now that it's async.
BUG=1303289
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 930a0f9..804859f 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -485,13 +485,12 @@ void TabStripModel::ExecuteContextMenuCommand( UserMetrics::RecordAction(L"TabContextMenu_CloseTabsOpenedBy", profile_); NavigationController* opener = GetTabContentsAt(context_index)->controller(); - int next_index = context_index; - while (true) { - next_index = GetIndexOfNextTabContentsOpenedBy(opener, 0, true); - if (next_index == kNoTab) - break; - CloseTabContentsAt(next_index); + + for (int i = count() - 1; i > context_index; --i) { + if (OpenerMatches(contents_data_.at(i), opener, true)) + CloseTabContentsAt(i); } + break; } default: |