Skip to content
Snippets Groups Projects
Commit 4ed43809 authored by pam@chromium.org's avatar pam@chromium.org
Browse files

Set active_dialog_ before showing it, since showing a dialog can sometimes

actually move to the next one in the queue instead.

BUG=26398
TEST=Make sure alert/confirm boxes work properly. Make sure a background
    tab that shows a (delayed) alert box works. Same with a background
    browser. Especially make sure http://crbug.com/10699 doesn't recur.
Review URL: http://codereview.chromium.org/339094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30766 0039d316-1c4b-4281-b951-d872f2087c98
parent 5a05c47a
No related branches found
No related tags found
No related merge requests found
......@@ -30,6 +30,8 @@ void AppModalDialogQueue::ActivateModalDialog() {
}
void AppModalDialogQueue::ShowModalDialog(AppModalDialog* dialog) {
dialog->ShowModalDialog();
// 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();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment