Dismiss action in tab modal dialogs.

chrome/browser/download/download_danger_prompt.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/download/download_danger_prompt.h"
 
 #include "base/bind.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
@@ skipping 24 matching lines @@
   // content::DownloadItem::Observer
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
   virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE;
 
   // TabModalConfirmDialogDelegate
   virtual string16 GetTitle() OVERRIDE;
   virtual string16 GetMessage() OVERRIDE;
   virtual string16 GetAcceptButtonTitle() OVERRIDE;
   virtual void OnAccepted() OVERRIDE;
   virtual void OnCanceled() OVERRIDE;
+  virtual void OnDismissed() OVERRIDE;
 
   // Runs |callback|. PrepareToClose() is called beforehand. Doing so prevents
   // this object from responding to state changes in |download_| that might
   // result from invoking the callback. |callback| must refer to either
   // |accepted_| or |canceled_|.
   void RunCallback(const base::Closure& callback);
 
   // Resets |accepted_|, |canceled_| and removes the observer from |download_|,
   // in preparation for closing the prompt.
   void PrepareToClose();
@@ skipping 84 matching lines @@
 }
 
 void DownloadDangerPromptImpl::OnAccepted() {
   RunCallback(accepted_);
 }
 
 void DownloadDangerPromptImpl::OnCanceled() {
   RunCallback(canceled_);
 }
 
+void DownloadDangerPromptImpl::OnDismissed() {
+  RunCallback(canceled_);

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

Should I call OnCanceled here to avoid code duplication? It would break the
guarantee that exactly one |On...| method is called.

[benjhayden, 2013/06/28 16:05:46]

I have a slight preference for calling RunCallback over calling OnCanceled for
consistency, but it doesn't matter much to me.
Alternatively, you could make the base class implementation of OnDismissed()
call OnCanceled() so that only those prompts that want to do something different
need to override it.

+}
+
 void DownloadDangerPromptImpl::RunCallback(const base::Closure& callback) {
   // Invoking the callback can cause the download item state to change or cause
   // the constrained window to close, and |callback| refers to a member
   // variable.
   base::Closure callback_copy = callback;
   PrepareToClose();
   if (!callback_copy.is_null())
     callback_copy.Run();
 }
 
@@ skipping 14 matching lines @@
     content::WebContents* web_contents,
     bool show_context,
     const base::Closure& accepted,
     const base::Closure& canceled) {
   DownloadDangerPromptImpl* prompt = new DownloadDangerPromptImpl(
       item, web_contents, show_context, accepted, canceled);
   // |prompt| will be deleted when the dialog is done.
   TabModalConfirmDialog::Create(prompt, web_contents);
   return prompt;
 }