Allow navigation while a JavaScript dialog is up.

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"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_features.h"
 #include "components/app_modal/javascript_dialog_manager.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(JavaScriptDialogTabHelper);
 
 namespace {
 
 bool IsEnabled() {
   return base::FeatureList::IsEnabled(features::kAutoDismissingDialogs);
 }
 
@@ skipping 30 matching lines @@
 enum class JavaScriptDialogTabHelper::DismissalCause {
   // This is used for a UMA histogram. Please never alter existing values, only
   // append new ones.
   TAB_HELPER_DESTROYED = 0,
   SUBSEQUENT_DIALOG_SHOWN = 1,
   HANDLE_DIALOG_CALLED = 2,
   CANCEL_DIALOGS_CALLED = 3,
   TAB_HIDDEN = 4,
   BROWSER_SWITCHED = 5,
   DIALOG_BUTTON_CLICKED = 6,
+  TAB_NAVIGATED = 7,
   MAX,
 };
 
 JavaScriptDialogTabHelper::JavaScriptDialogTabHelper(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
 }
 
 JavaScriptDialogTabHelper::~JavaScriptDialogTabHelper() {
   if (dialog_) {
@@ skipping 158 matching lines @@
 
   // 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_)
+  if (dialog_) {
     CloseDialog(suppress_callbacks, 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_) {
+  if (dialog_)
     CloseDialog(false, 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);
+}
+
+// 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);
 }
 
 void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) {
   if (dialog_ && !IsWebContentsForemost(web_contents())) {
     CloseDialog(false, false, base::string16(),
                 DismissalCause::BROWSER_SWITCHED);
   }
 }
 
 void JavaScriptDialogTabHelper::LogDialogDismissalCause(
@@ skipping 39 matching lines @@
     dialog_callback_.Run(success, user_input);
 
   ClearDialogInfo();
 }
 
 void JavaScriptDialogTabHelper::ClearDialogInfo() {
   dialog_.reset();
   dialog_callback_.Reset();
   BrowserList::RemoveObserver(this);
 }