diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:55:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:55:15 +0000 |
| commit | 91c7fcaec1bec76a05d938e4e436d1efaa7eee8c (patch) | |
| tree | e1173aa6da34adda9034cae6d13bc5dba8c6a6c5 /chrome/browser/app_modal_dialog_queue.cc | |
| parent | ca25209a0338e538e0199b07bbd5c2411f52e906 (diff) | |
| download | chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.zip chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.tar.gz chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.tar.bz2 | |
Revert 39756 - 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
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/652150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39766 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, 1 insertions, 3 deletions
diff --git a/chrome/browser/app_modal_dialog_queue.cc b/chrome/browser/app_modal_dialog_queue.cc index f10cab1..3d4f2da 100644 --- a/chrome/browser/app_modal_dialog_queue.cc +++ b/chrome/browser/app_modal_dialog_queue.cc @@ -28,10 +28,8 @@ void AppModalDialogQueue::ActivateModalDialog() { } void AppModalDialogQueue::ShowModalDialog(AppModalDialog* dialog) { - // Must happen before |ShowModalDialog()| is called, because - // |ShowModalDialog()| might end up calling |ShowNextDialog()|. - active_dialog_ = dialog; dialog->ShowModalDialog(); + active_dialog_ = dialog; } AppModalDialog* AppModalDialogQueue::GetNextDialog() { |