Dismiss action in tab modal dialogs.

chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc

 // 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.
 
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 18 matching lines @@
   // If we end up here, the window has been closed, so make sure we don't close
   // it again.
   close_delegate_ = NULL;
   // Make sure everything is cleaned up.
   Cancel();
 }
 
 void TabModalConfirmDialogDelegate::Cancel() {
   if (closing_)
     return;
-  // Make sure we won't do anything when |Cancel()| or |Accept()| is called
-  // again.
+  // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnCanceled();
   CloseDialog();
 }
 
 void TabModalConfirmDialogDelegate::Accept() {
   if (closing_)
     return;
-  // Make sure we won't do anything when |Cancel()| or |Accept()| is called
-  // again.
+  // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnAccepted();
   CloseDialog();
 }
 
 void TabModalConfirmDialogDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   if (closing_)
     return;
   // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnLinkClicked(disposition);
   CloseDialog();
 }
 
 void TabModalConfirmDialogDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   // Close the dialog if we load a page (because the action might not apply to
   // the same page anymore) or if the tab is closed.
   if (type == content::NOTIFICATION_LOAD_START ||
       type == chrome::NOTIFICATION_TAB_CLOSING) {
-    Cancel();
+    Close();
   } else {
     NOTREACHED();
   }
 }
 
+void TabModalConfirmDialogDelegate::Close() {
+  if (closing_)
+    return;
+  // Make sure we won't do anything when another action occurs.
+  closing_ = true;
+  OnClosed();
+  CloseDialog();
+}
+
 gfx::Image* TabModalConfirmDialogDelegate::GetIcon() {
   return NULL;
 }
 
 string16 TabModalConfirmDialogDelegate::GetAcceptButtonTitle() {
   return l10n_util::GetStringUTF16(IDS_OK);
 }
 
 string16 TabModalConfirmDialogDelegate::GetCancelButtonTitle() {
   return l10n_util::GetStringUTF16(IDS_CANCEL);
@@ skipping 14 matching lines @@
 void TabModalConfirmDialogDelegate::OnAccepted() {
 }
 
 void TabModalConfirmDialogDelegate::OnCanceled() {
 }
 
 void TabModalConfirmDialogDelegate::OnLinkClicked(
     WindowOpenDisposition disposition) {
 }
 
+void TabModalConfirmDialogDelegate::OnClosed() {
+}
+
 void TabModalConfirmDialogDelegate::CloseDialog() {
   if (close_delegate_)
     close_delegate_->CloseDialog();
 }