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

Unified Diff: chrome/browser/ui/app_modal_dialogs/message_box_handler.cc

Issue 7661029: Fix handling of tab contents disappearing out from underneath Javascript dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: check delegate too Created 9 years, 4 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
Index: chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
diff --git a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
index 861d0731d66fe057c3ffab6c4d4d39f20ca1435f..9dc374a865920d655aa5a567e003ff8f8b0bba00 100644
--- a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
+++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
@@ -174,6 +174,9 @@ string16 ChromeJavaScriptDialogCreator::GetTitle(TitleType title_type,
void ChromeJavaScriptDialogCreator::CancelPendingDialogs(
content::DialogDelegate* delegate) {
AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
+ AppModalDialog* active_dialog = queue->active_dialog();
+ if (active_dialog && active_dialog->delegate() == delegate)
+ active_dialog->Invalidate();
for (AppModalDialogQueue::iterator i = queue->begin();
i != queue->end(); ++i) {
if ((*i)->delegate() == delegate)
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h ('k') | content/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698