Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/automation/automation_provider.cc

Issue 113932: Clean-up of the app modal dialog queue (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_modal_dialog_queue.cc ('k') | chrome/browser/jsmessage_box_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/automation_provider.cc
===================================================================
--- chrome/browser/automation/automation_provider.cc (revision 17006)
+++ chrome/browser/automation/automation_provider.cc (working copy)
@@ -1342,7 +1342,8 @@
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::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) ==
« no previous file with comments | « chrome/browser/app_modal_dialog_queue.cc ('k') | chrome/browser/jsmessage_box_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698