Simplify the JavaScriptDialogManager.

content/shell/browser/shell_javascript_dialog_manager.cc

 // Copyright 2013 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 "content/shell/browser/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 86 matching lines @@
                                           message_text,
                                           base::string16(),  // default
                                           callback));
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
   callback.Run(true, base::string16());
   return;
 #endif
 }
 
-void ShellJavaScriptDialogManager::CancelActiveAndPendingDialogs(
-    WebContents* web_contents) {
+void ShellJavaScriptDialogManager::CancelDialogs(WebContents* web_contents,
+                                                 bool suppress_callbacks,
+                                                 bool reset_state) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (dialog_) {
     dialog_->Cancel();
     dialog_.reset();
   }
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
-}
 
-void ShellJavaScriptDialogManager::ResetDialogState(WebContents* web_contents) {
   if (before_unload_callback_.is_null())
     return;
-  before_unload_callback_.Run(false, base::string16());
-  before_unload_callback_.Reset();
+
+  if (reset_state) {
+    before_unload_callback_.Run(false, base::string16());
+    before_unload_callback_.Reset();
+  }
 }
 
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content