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

Unified Diff: components/app_modal/javascript_app_modal_dialog.cc

Issue 2412843002: Simplify the JavaScriptDialogManager. (Closed)
Patch Set: braces Created 4 years, 2 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: components/app_modal/javascript_app_modal_dialog.cc
diff --git a/components/app_modal/javascript_app_modal_dialog.cc b/components/app_modal/javascript_app_modal_dialog.cc
index 7a48f2a3a598e593854675648b3c090a0d3f7be9..992f646a91987aca2f55ef97c0d2b410492e98c4 100644
--- a/components/app_modal/javascript_app_modal_dialog.cc
+++ b/components/app_modal/javascript_app_modal_dialog.cc
@@ -92,12 +92,13 @@ bool JavaScriptAppModalDialog::IsJavaScriptModalDialog() {
return true;
}
-void JavaScriptAppModalDialog::Invalidate() {
+void JavaScriptAppModalDialog::Invalidate(bool suppress_callbacks) {
if (!IsValid())
return;
- AppModalDialog::Invalidate();
- CallDialogClosedCallback(false, base::string16());
+ AppModalDialog::Invalidate(suppress_callbacks);
+ if (!suppress_callbacks)
+ CallDialogClosedCallback(false, base::string16());
if (native_dialog())
CloseModalDialog();
}
@@ -154,7 +155,7 @@ void JavaScriptAppModalDialog::NotifyDelegate(bool success,
// On Views, we can end up coming through this code path twice :(.
// See crbug.com/63732.
- AppModalDialog::Invalidate();
+ AppModalDialog::Invalidate(false);
}
void JavaScriptAppModalDialog::CallDialogClosedCallback(bool success,
« no previous file with comments | « components/app_modal/javascript_app_modal_dialog.h ('k') | components/app_modal/javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698