Simplify the JavaScriptDialogManager.

components/app_modal/javascript_dialog_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
 #define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 39 matching lines @@
                            const base::string16& message_text,
                            const base::string16& default_prompt_text,
                            const DialogClosedCallback& callback,
                            bool* did_suppress_message) override;
   void RunBeforeUnloadDialog(content::WebContents* web_contents,
                              bool is_reload,
                              const DialogClosedCallback& callback) override;
   bool HandleJavaScriptDialog(content::WebContents* web_contents,
                               bool accept,
                               const base::string16* prompt_override) override;
-  void CancelActiveAndPendingDialogs(
-      content::WebContents* web_contents) override;
-  void ResetDialogState(content::WebContents* web_contents) override;
+  void CancelDialogs(content::WebContents* web_contents,
+                     bool suppress_callbacks,
+                     bool reset_state) override;
 
   base::string16 GetTitle(content::WebContents* web_contents,
                           const GURL& origin_url,
                           bool is_alert);
 
   // Wrapper around OnDialogClosed; logs UMA stats before continuing on.
   void OnBeforeUnloadDialogClosed(content::WebContents* web_contents,
                                   DialogClosedCallback callback,
                                   bool success,
                                   const base::string16& user_input);
@@ skipping 16 matching lines @@
   // dialogs. (Since Javascript dialogs are modal, this is even accurate!)
   base::TimeTicks last_close_time_;
   base::TimeTicks last_creation_time_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManager);
 };
 
 }  // namespace app_modal
 
 #endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_