diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 17:02:07 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 17:02:07 +0000 |
| commit | 1f46007516b8ab87a9089bfab64621595b869e54 (patch) | |
| tree | 7542b70956c2811c4d3ef6be53c38bbc97dabec4 /chrome/browser/automation/automation_provider.cc | |
| parent | 2a4fab98a8dd8a65f16d64acb1f51d8a0076a25f (diff) | |
| download | chromium_src-1f46007516b8ab87a9089bfab64621595b869e54.zip chromium_src-1f46007516b8ab87a9089bfab64621595b869e54.tar.gz chromium_src-1f46007516b8ab87a9089bfab64621595b869e54.tar.bz2 | |
This CL is a clean-up of the app_modal_dialog_queue.cc in an attempt to fix a bug 10699.
Not sure what is causing the crasher.
Hopefully after this clean-up we'll get a different stack-trace that might help.
BUG=10699
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.
Review URL: http://codereview.chromium.org/113932
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider.cc')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index c2b2db8..c2e0877 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1342,7 +1342,8 @@ void AutomationProvider::GetNormalBrowserWindowCount(int* window_count) { void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog, int* dialog_button) { - AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog(); + AppModalDialog* dialog_delegate = + Singleton<AppModalDialogQueue>()->active_dialog(); *showing_dialog = (dialog_delegate != NULL); if (*showing_dialog) *dialog_button = dialog_delegate->GetDialogButtons(); @@ -1353,7 +1354,8 @@ void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog, void AutomationProvider::ClickAppModalDialogButton(int button, bool* success) { *success = false; - AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog(); + AppModalDialog* dialog_delegate = + Singleton<AppModalDialogQueue>()->active_dialog(); if (dialog_delegate && (dialog_delegate->GetDialogButtons() & button) == button) { if ((button & MessageBoxFlags::DIALOGBUTTON_OK) == |