Make a clean interface for dialog callbacks.

chrome/browser/ui/app_modal_dialogs/message_box_handler.cc

 // Copyright (c) 2011 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/app_modal_dialogs/message_box_handler.h"
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
@@ skipping 31 matching lines @@
  private:
   explicit ChromeJavaScriptDialogCreator();
   virtual ~ChromeJavaScriptDialogCreator();
 
   friend struct DefaultSingletonTraits<ChromeJavaScriptDialogCreator>;
 
   string16 GetTitle(TitleType title_type,
                     const string16& title,
                     bool is_alert);
 
+  void CancelPendingDialogs(content::DialogDelegate* delegate);
+
   // Mapping between the JavaScriptDialogDelegates and their extra data. The key
   // is a void* because the pointer is just a cookie and is never dereferenced.
   typedef std::map<void*, ChromeJavaScriptDialogExtraData>
       JavaScriptDialogExtraDataMap;
   JavaScriptDialogExtraDataMap javascript_dialog_extra_data_;
 };
 
 //------------------------------------------------------------------------------
 
 ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator() {
@@ skipping 69 matching lines @@
       ui::MessageBoxFlags::kIsJavascriptConfirm,
       full_message,
       string16(),  // default_prompt_text
       false,       // display_suppress_checkbox
       true,        // is_before_unload_dialog
       reply_message));
 }
 
 void ChromeJavaScriptDialogCreator::ResetJavaScriptState(
     content::JavaScriptDialogDelegate* delegate) {
+  CancelPendingDialogs(delegate);
   javascript_dialog_extra_data_.erase(delegate);
 }
 
 string16 ChromeJavaScriptDialogCreator::GetTitle(TitleType title_type,
                                                  const string16& title,
                                                  bool is_alert) {
   switch (title_type) {
     case DIALOG_TITLE_NONE: {
       return l10n_util::GetStringUTF16(
           is_alert ? IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE
@@ skipping 10 matching lines @@
           is_alert ? IDS_JAVASCRIPT_ALERT_TITLE
                    : IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
           base::i18n::GetDisplayStringInLTRDirectionality(title));
       break;
     }
   }
   NOTREACHED();
   return string16();
 }
 
+void ChromeJavaScriptDialogCreator::CancelPendingDialogs(
+    content::DialogDelegate* delegate) {
+  AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
+  for (AppModalDialogQueue::iterator i = queue->begin();
+       i != queue->end(); ++i) {
+    if ((*i)->delegate() == delegate)
+      (*i)->Invalidate();
+  }
+}
+
 //------------------------------------------------------------------------------
 
 content::JavaScriptDialogCreator* GetJavaScriptDialogCreatorInstance() {
   return ChromeJavaScriptDialogCreator::GetInstance();
 }