Simplify the JavaScriptDialogManager.

components/app_modal/javascript_dialog_manager.cc

 // Copyright 2014 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 "components/app_modal/javascript_dialog_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 223 matching lines @@
   if (accept) {
     if (prompt_override)
       dialog->SetOverridePromptText(*prompt_override);
     dialog->native_dialog()->AcceptAppModalDialog();
   } else {
     dialog->native_dialog()->CancelAppModalDialog();
   }
   return true;
 }
 
-void JavaScriptDialogManager::ResetDialogState(
-    content::WebContents* web_contents) {
-  CancelActiveAndPendingDialogs(web_contents);
-  javascript_dialog_extra_data_.erase(web_contents);
-}
-
 base::string16 JavaScriptDialogManager::GetTitle(
     content::WebContents* web_contents,
     const GURL& origin_url,
     bool is_alert) {
   // For extensions, show the extension name, but only if the origin of
   // the alert matches the top-level WebContents.
   std::string name;
   if (extensions_client_->GetExtensionName(web_contents, origin_url, &name))
     return base::UTF8ToUTF16(name);
 
@@ skipping 14 matching lines @@
         is_same_origin_as_main_frame ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE
                                      : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_IFRAME,
         base::i18n::GetDisplayStringInLTRDirectionality(url_string));
   }
   return l10n_util::GetStringUTF16(
       is_same_origin_as_main_frame
           ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL
           : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME);
 }
 
-void JavaScriptDialogManager::CancelActiveAndPendingDialogs(
-    content::WebContents* web_contents) {
+void JavaScriptDialogManager::CancelDialogs(content::WebContents* web_contents,
+                                            bool suppress_callbacks,
+                                            bool reset_state) {
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
   AppModalDialog* active_dialog = queue->active_dialog();
   for (AppModalDialogQueue::iterator i = queue->begin();
        i != queue->end(); ++i) {
     // Invalidating the active dialog might trigger showing a not-yet
     // invalidated dialog, so invalidate the active dialog last.
     if ((*i) == active_dialog)
       continue;
     if ((*i)->web_contents() == web_contents)
-      (*i)->Invalidate();
+      (*i)->Invalidate(suppress_callbacks);
   }
   if (active_dialog && active_dialog->web_contents() == web_contents)
-    active_dialog->Invalidate();
+    active_dialog->Invalidate(suppress_callbacks);
+
+  if (reset_state)
+    javascript_dialog_extra_data_.erase(web_contents);
 }
 
 void JavaScriptDialogManager::OnBeforeUnloadDialogClosed(
     content::WebContents* web_contents,
     DialogClosedCallback callback,
     bool success,
     const base::string16& user_input) {
   enum class StayVsLeave {
     STAY = 0,
     LEAVE = 1,
@@ skipping 16 matching lines @@
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   last_close_time_ = base::TimeTicks::Now();
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal