commit 6879fcfed049c28357eaa85c6d9a0126db54c0d7
author avi <avi@chromium.org> Sat Jan 21 05:27:53 2017
committer Commit bot <commit-bot@chromium.org> Sat Jan 21 05:27:53 2017
tree d679fbd7a610217e34d7eb65dd47d83634afb1c4
parent 0e03a131eaf48ffbd708263f5e86be5b4f0c486f

Clean up unneeded JavaScript dialog parameter.

Removes a parameter unneeded after https://codereview.chromium.org/2641173004.

BUG=682060
TEST=none

Review-Url: https://codereview.chromium.org/2639893002
Cr-Commit-Position: refs/heads/master@{#445273}

content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6bf87642..95a4592 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -514,10 +514,7 @@
 
   // Clear out any JavaScript state.
   if (dialog_manager_) {
-    // This object is being destructed, so make sure that no callbacks happen.
-    dialog_manager_->CancelDialogs(this,
-                                   true,   // suppress_callbacks,
-                                   true);  // reset_state
+    dialog_manager_->CancelDialogs(this, /*reset_state=*/true);
   }
 
   if (color_chooser_info_.get())
@@ -898,9 +895,7 @@
 
 void WebContentsImpl::CancelActiveAndPendingDialogs() {
   if (dialog_manager_) {
-    dialog_manager_->CancelDialogs(this,
-                                   false,   // suppress_callbacks,
-                                   false);  // reset_state
+    dialog_manager_->CancelDialogs(this, /*reset_state=*/false);
   }
   if (browser_plugin_embedder_)
     browser_plugin_embedder_->CancelGuestDialogs();
@@ -3471,9 +3466,7 @@
   // If this is a user-initiated navigation, start allowing JavaScript dialogs
   // again.
   if (params.gesture == NavigationGestureUser && dialog_manager_) {
-    dialog_manager_->CancelDialogs(this,
-                                   false,  // suppress_callbacks,
-                                   true);  // reset_state
+    dialog_manager_->CancelDialogs(this, /*reset_state=*/true);
   }
 
   // Notify observers about navigation.
@@ -4950,9 +4943,7 @@
   // cross-process navigation will either destroy the browser plugins or not
   // require their dialogs to close.
   if (dialog_manager_) {
-    dialog_manager_->CancelDialogs(this,
-                                   false,  // suppress_callbacks,
-                                   true);  // reset_state
+    dialog_manager_->CancelDialogs(this, /*reset_state=*/true);
   }
 }