Dismiss action in tab modal dialogs.

ui/views/window/dialog_client_view.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 "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 36 matching lines @@
 
 void DialogClientView::AcceptWindow() {
   // Only notify the delegate once. See |notified_delegate_|'s comment.
   if (!notified_delegate_ && GetDialogDelegate()->Accept(false)) {
     notified_delegate_ = true;
     Close();
   }
 }
 
 void DialogClientView::CancelWindow() {
-  // Call the standard Close handler, which checks with the delegate before
-  // proceeding. This checking _isn't_ done here, but in the WM_CLOSE handler,
-  // so that the close box on the window also shares this code path.
-  Close();
+  // Only notify the delegate once. See |notified_delegate_|'s comment.
+  if (!notified_delegate_ && GetDialogDelegate()->Cancel()) {
+    notified_delegate_ = true;
+    Close();
+  }
 }
 
 void DialogClientView::UpdateDialogButtons() {
   const int buttons = GetDialogDelegate()->GetDialogButtons();
   ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
   if (default_button_)
     default_button_->SetIsDefault(false);
   default_button_ = NULL;
 
   if (buttons & ui::DIALOG_BUTTON_OK) {
@@ skipping 30 matching lines @@
     ResetAccelerators();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ClientView overrides:
 
 bool DialogClientView::CanClose() {
   if (notified_delegate_)
     return true;
 
-  DialogDelegate* dialog = GetDialogDelegate();
-  int buttons = dialog->GetDialogButtons();
-  bool close = true;
-  if ((buttons & ui::DIALOG_BUTTON_CANCEL) ||
-      (buttons == ui::DIALOG_BUTTON_NONE))
-    close = dialog->Cancel();
-  else if (buttons & ui::DIALOG_BUTTON_OK)
-    close = dialog->Accept(true);
-  notified_delegate_ = close;
-  return close;
+  // The dialog is closing but no Accept or Cancel action has been performed
+  // before: it's a Dismiss action.
+  if (GetDialogDelegate()->Dismiss()) {
+    notified_delegate_ = true;
+    GetDialogDelegate()->OnClose();

[fdoray, 2013/06/28 15:32:59]

Before this CL, DialogDelegate::OnClose was not called when a dialog was closed
by clicking the "X" button.

+    return true;
+  }
+  return false;
 }
 
 DialogClientView* DialogClientView::AsDialogClientView() {
   return this;
 }
 
 const DialogClientView* DialogClientView::AsDialogClientView() const {
   return this;
 }
 
@@ skipping 261 matching lines @@
       gfx::Insets(0, kButtonHEdgeMargin,
                   kButtonVEdgeMargin, kButtonHEdgeMargin);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views