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 "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 
 TabModalConfirmDialogDelegate::TabModalConfirmDialogDelegate()
     : operations_delegate_(NULL),
       closing_(false) {
 }
 
 TabModalConfirmDialogDelegate::~TabModalConfirmDialogDelegate() {
   // If we end up here, the window has been closed, so make sure we don't close
   // it again.
   operations_delegate_ = NULL;
   // Make sure everything is cleaned up.
   Cancel();
 }
 
-void TabModalConfirmDialogDelegate::Cancel() {
+bool TabModalConfirmDialogDelegate::Cancel() {
   if (closing_)
-    return;
-  // Make sure we won't do anything when |Cancel()| or |Accept()| is called
-  // again.
+    return false;
+  // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnCanceled();
   CloseDialog();
+  return true;
 }
 
-void TabModalConfirmDialogDelegate::Accept() {
+bool TabModalConfirmDialogDelegate::Accept() {
   if (closing_)
-    return;
-  // Make sure we won't do anything when |Cancel()| or |Accept()| is called
-  // again.
+    return false;
+  // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnAccepted();
   CloseDialog();
+  return true;
 }
 
-void TabModalConfirmDialogDelegate::LinkClicked(
+bool TabModalConfirmDialogDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   if (closing_)
-    return;
+    return false;
   // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnLinkClicked(disposition);
   CloseDialog();
+  return true;
+}
+
+bool TabModalConfirmDialogDelegate::Close() {
+  if (closing_)
+    return false;
+  // Make sure we won't do anything when another action occurs.
+  closing_ = true;
+  OnClosed();
+  CloseDialog();

[fdoray, 2013/07/24 20:21:07]

For Views, calling CloseDialog() in Cancel(), Accept() and Close() is useless
because these methods are called when the widget is already trying to close
itself. The call is there for GTK and Cocoa.

Better to move the calls after the calls to Cancel, Accept and Close in the GTK
and Cocoa implementations?

+  return true;
 }
 
 gfx::Image* TabModalConfirmDialogDelegate::GetIcon() {
   return NULL;
 }
 
 string16 TabModalConfirmDialogDelegate::GetAcceptButtonTitle() {
   return l10n_util::GetStringUTF16(IDS_OK);
 }
 
@@ skipping 16 matching lines @@
 void TabModalConfirmDialogDelegate::OnAccepted() {
 }
 
 void TabModalConfirmDialogDelegate::OnCanceled() {
 }
 
 void TabModalConfirmDialogDelegate::OnLinkClicked(
     WindowOpenDisposition disposition) {
 }
 
+void TabModalConfirmDialogDelegate::OnClosed() {
+}
+
 void TabModalConfirmDialogDelegate::CloseDialog() {
   if (operations_delegate_)
     operations_delegate_->CloseDialog();
 }