Make the callback from JavaScript dialogs even when closing a WebContents.

chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 60 matching lines @@
   MAX,
 };
 
 JavaScriptDialogTabHelper::JavaScriptDialogTabHelper(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
 }
 
 JavaScriptDialogTabHelper::~JavaScriptDialogTabHelper() {
   if (dialog_) {
-    CloseDialog(true /*suppress_callback*/, false, base::string16(),
-                DismissalCause::TAB_HELPER_DESTROYED);
+    CloseDialog(false, base::string16(), DismissalCause::TAB_HELPER_DESTROYED);
   }
 }
 
 void JavaScriptDialogTabHelper::SetDialogShownCallbackForTesting(
     base::Closure callback) {
   dialog_shown_ = callback;
 }
 
 void JavaScriptDialogTabHelper::RunJavaScriptDialog(
     content::WebContents* alerting_web_contents,
@@ skipping 48 matching lines @@
           "A window.prompt() dialog generated by this page was suppressed "
           "because this page is not the active tab of the front window. "
           "Please make sure your dialogs are triggered by user interactions "
           "to avoid this situation. "
           "https://www.chromestatus.com/feature/5637107137642496");
       return;
     }
 
     if (dialog_) {
       // There's already a dialog up; clear it out.
-      CloseDialog(false, false, base::string16(),
+      CloseDialog(false, base::string16(),
                   DismissalCause::SUBSEQUENT_DIALOG_SHOWN);
     }
 
     base::string16 title =
         AppModalDialogManager()->GetTitle(alerting_web_contents, origin_url);
     dialog_callback_ = callback;
     message_type_ = message_type;
     dialog_ = JavaScriptDialog::Create(
         parent_web_contents, alerting_web_contents, title, message_type,
         message_text, default_prompt_text,
@@ skipping 62 matching lines @@
   return AppModalDialogManager()->RunBeforeUnloadDialog(
       web_contents, is_reload,
       base::Bind(&SaveUnloadUmaStats, engagement_score, callback));
 }
 
 bool JavaScriptDialogTabHelper::HandleJavaScriptDialog(
     content::WebContents* web_contents,
     bool accept,
     const base::string16* prompt_override) {
   if (dialog_) {
-    CloseDialog(false /*suppress_callback*/, accept,
-                prompt_override ? *prompt_override : base::string16(),
+    CloseDialog(accept, prompt_override ? *prompt_override : base::string16(),
                 DismissalCause::HANDLE_DIALOG_CALLED);
     return true;
   }
 
   // Handle any app-modal dialogs being run by the app-modal dialog system.
   return AppModalDialogManager()->HandleJavaScriptDialog(web_contents, accept,
                                                          prompt_override);
 }
 
 void JavaScriptDialogTabHelper::CancelDialogs(
     content::WebContents* web_contents,
     bool suppress_callbacks,
     bool reset_state) {
   if (dialog_) {
-    CloseDialog(suppress_callbacks, false, base::string16(),
-                DismissalCause::CANCEL_DIALOGS_CALLED);
+    CloseDialog(false, base::string16(), DismissalCause::CANCEL_DIALOGS_CALLED);
   }
 
   // Cancel any app-modal dialogs being run by the app-modal dialog system.
   return AppModalDialogManager()->CancelDialogs(
       web_contents, suppress_callbacks, reset_state);
 }
 
 void JavaScriptDialogTabHelper::WasHidden() {
   if (dialog_)
-    CloseDialog(false, false, base::string16(), DismissalCause::TAB_HIDDEN);
+    CloseDialog(false, base::string16(), DismissalCause::TAB_HIDDEN);
 }
 
 // This function handles the case where browser-side navigation (PlzNavigate) is
 // enabled. DidStartNavigationToPendingEntry, below, handles the case where
 // PlzNavigate is not enabled. TODO(avi): When the non-PlzNavigate code is
 // removed, remove DidStartNavigationToPendingEntry.
 void JavaScriptDialogTabHelper::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   // Close the dialog if the user started a new navigation. This allows reloads
   // and history navigations to proceed.
   if (dialog_)
-    CloseDialog(false, false, base::string16(), DismissalCause::TAB_NAVIGATED);
+    CloseDialog(false, base::string16(), DismissalCause::TAB_NAVIGATED);
 }
 
 // This function handles the case where browser-side navigation (PlzNavigate) is
 // not enabled. DidStartNavigation, above, handles the case where PlzNavigate is
 // enabled. TODO(avi): When the non-PlzNavigate code is removed, remove
 // DidStartNavigationToPendingEntry.
 void JavaScriptDialogTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::ReloadType reload_type) {
   // Close the dialog if the user started a new navigation. This allows reloads
   // and history navigations to proceed.
   if (dialog_)
-    CloseDialog(false, false, base::string16(), DismissalCause::TAB_NAVIGATED);
+    CloseDialog(false, base::string16(), DismissalCause::TAB_NAVIGATED);
 }
 
 void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) {
   if (dialog_ && !IsWebContentsForemost(web_contents())) {
-    CloseDialog(false, false, base::string16(),
-                DismissalCause::BROWSER_SWITCHED);
+    CloseDialog(false, base::string16(), DismissalCause::BROWSER_SWITCHED);
   }
 }
 
 void JavaScriptDialogTabHelper::LogDialogDismissalCause(
     JavaScriptDialogTabHelper::DismissalCause cause) {
   switch (message_type_) {
     case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
       UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Alert",
                                 static_cast<int>(cause),
                                 static_cast<int>(DismissalCause::MAX));
@@ skipping 14 matching lines @@
 void JavaScriptDialogTabHelper::OnDialogClosed(
     DialogClosedCallback callback,
     bool success,
     const base::string16& user_input) {
   LogDialogDismissalCause(DismissalCause::DIALOG_BUTTON_CLICKED);
   callback.Run(success, user_input);
 
   ClearDialogInfo();
 }
 
-void JavaScriptDialogTabHelper::CloseDialog(bool suppress_callback,
-                                            bool success,
+void JavaScriptDialogTabHelper::CloseDialog(bool success,
                                             const base::string16& user_input,
                                             DismissalCause cause) {
   DCHECK(dialog_);
   LogDialogDismissalCause(cause);
 
   dialog_->CloseDialogWithoutCallback();
-  if (!suppress_callback)
-    dialog_callback_.Run(success, user_input);
+  dialog_callback_.Run(success, user_input);
 
   ClearDialogInfo();
 }
 
 void JavaScriptDialogTabHelper::ClearDialogInfo() {
   dialog_.reset();
   dialog_callback_.Reset();
   BrowserList::RemoveObserver(this);
 }