diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 19:35:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 19:35:09 +0000 |
| commit | bcace2312fa983e395424605f1929859279ed9d3 (patch) | |
| tree | 1a3534c77628688729c5efe740c3f889530d6cee /chrome/browser/app_modal_dialog_queue.cc | |
| parent | 4334bcb2fafca26d8d7c7ffeed436f44a94568e5 (diff) | |
| download | chromium_src-bcace2312fa983e395424605f1929859279ed9d3.zip chromium_src-bcace2312fa983e395424605f1929859279ed9d3.tar.gz chromium_src-bcace2312fa983e395424605f1929859279ed9d3.tar.bz2 | |
Mac: Cookie confirmation dialog.
This is not the final UI (the "more info" disclosure triangle is missing), but it's pretty close and, more importantly, functional.
BUG=34894
TEST=Go to Preferences->under the hood->content settings->cookies and select "ask me every time". Then browser around and note that a message box pops up all the time. All the buttons on the message box should do what they claim.
Review URL: http://codereview.chromium.org/650206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39756 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() { |