diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:13:13 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:13:13 +0000 |
| commit | 9f92f9ea3310af9846f84a5390cb52b00ff0a59c (patch) | |
| tree | bf71442a252c5f6dc5ab2b215457053016a5cabb /chrome/browser/app_modal_dialog_queue.cc | |
| parent | c35a2e94a749acdf7079d7202b98eb863f7e9e96 (diff) | |
| download | chromium_src-9f92f9ea3310af9846f84a5390cb52b00ff0a59c.zip chromium_src-9f92f9ea3310af9846f84a5390cb52b00ff0a59c.tar.gz chromium_src-9f92f9ea3310af9846f84a5390cb52b00ff0a59c.tar.bz2 | |
Part of http://codereview.chromium.org/650206
Review URL: http://codereview.chromium.org/657004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_modal_dialog_queue.cc')
| -rw-r--r-- | chrome/browser/app_modal_dialog_queue.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/app_modal_dialog_queue.cc b/chrome/browser/app_modal_dialog_queue.cc index 3d4f2da..f10cab1 100644 --- a/chrome/browser/app_modal_dialog_queue.cc +++ b/chrome/browser/app_modal_dialog_queue.cc @@ -28,8 +28,10 @@ void AppModalDialogQueue::ActivateModalDialog() { } void AppModalDialogQueue::ShowModalDialog(AppModalDialog* dialog) { - dialog->ShowModalDialog(); + // Must happen before |ShowModalDialog()| is called, because + // |ShowModalDialog()| might end up calling |ShowNextDialog()|. active_dialog_ = dialog; + dialog->ShowModalDialog(); } AppModalDialog* AppModalDialogQueue::GetNextDialog() { |