diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 00:22:09 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 00:22:09 +0000 |
| commit | 0ce585afc7cbd616ef7258d9644e278deba1ebec (patch) | |
| tree | fbb75302cb95baa34517de2fce33ae766b9132e1 /chrome | |
| parent | 84f8e7836a88f4b0753f9dca164613141ef16a90 (diff) | |
| download | chromium_src-0ce585afc7cbd616ef7258d9644e278deba1ebec.zip chromium_src-0ce585afc7cbd616ef7258d9644e278deba1ebec.tar.gz chromium_src-0ce585afc7cbd616ef7258d9644e278deba1ebec.tar.bz2 | |
Reverting 30766. It caused failures in ui_tests BrowserTest.SingleBeforeUnloadAfterWindowClose and apparently made the browser_tests crash.
BUG=26398
TEST=covered by ui_tests and browser_tests
Review URL: http://codereview.chromium.org/354015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/app_modal_dialog_queue.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/app_modal_dialog_queue.cc b/chrome/browser/app_modal_dialog_queue.cc index d567485..2ab1398 100644 --- a/chrome/browser/app_modal_dialog_queue.cc +++ b/chrome/browser/app_modal_dialog_queue.cc @@ -30,8 +30,6 @@ void AppModalDialogQueue::ActivateModalDialog() { } void AppModalDialogQueue::ShowModalDialog(AppModalDialog* dialog) { - // Set active_dialog_ before showing it, because ShowModalDialog can wind up - // calling ShowNextDialog in some cases, which will change active_dialog_. - active_dialog_ = dialog; dialog->ShowModalDialog(); + active_dialog_ = dialog; } |