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/views/frame | |
| 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/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 43ac628..339c99c 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -471,13 +471,13 @@ bool BrowserView::GetAccelerator(int cmd_id, views::Accelerator* accelerator) { bool BrowserView::ActivateAppModalDialog() const { // If another browser is app modal, flash and activate the modal browser. - if (AppModalDialogQueue::HasActiveDialog()) { + if (Singleton<AppModalDialogQueue>()->HasActiveDialog()) { Browser* active_browser = BrowserList::GetLastActive(); if (active_browser && (browser_ != active_browser)) { active_browser->window()->FlashFrame(); active_browser->window()->Activate(); } - AppModalDialogQueue::ActivateModalDialog(); + Singleton<AppModalDialogQueue>()->ActivateModalDialog(); return true; } return false; |