Fix download danger prompt buttons/actions.

chrome/browser/ui/views/download/download_danger_prompt_views.cc

 // Copyright 2013 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/compiler_specific.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 37 matching lines @@
   void InvokeActionForTesting(Action action) override;
 
   // views::DialogDelegate methods:
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   base::string16 GetWindowTitle() const override;
   void DeleteDelegate() override;
   ui::ModalType GetModalType() const override;
   bool Cancel() override;
   bool Accept() override;
   bool Close() override;
-  views::View* GetInitiallyFocusedView() override;
   views::View* GetContentsView() override;
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
 
   // content::DownloadItem::Observer:
   void OnDownloadUpdated(content::DownloadItem* download) override;
 
  private:
   base::string16 GetAcceptButtonTitle() const;
   base::string16 GetCancelButtonTitle() const;
@@ skipping 108 matching lines @@
 
 void DownloadDangerPromptViews::DeleteDelegate() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   delete this;
 }
 
 ui::ModalType DownloadDangerPromptViews::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
+bool DownloadDangerPromptViews::Accept() {

[Mike Wittman, 2016/02/08 17:52:21]

nit: declaration order has this below Cancel()

[Evan Stade, 2016/02/08 19:12:57]

Done.

+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  // ExperienceSampling: User did not proceed down the dangerous path.
+  sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
+  // Note that the presentational concept of "Accept/Cancel" is inverted from
+  // the model's concept of ACCEPT/CANCEL. In the UI, the safe path is "Accept"
+  // and the dangerous path is "Cancel".
+  RunDone(CANCEL);
+  return true;
+}
+
 bool DownloadDangerPromptViews::Cancel() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // ExperienceSampling: User canceled the warning.
-  sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
-  RunDone(CANCEL);
-  return true;
-}
-
-bool DownloadDangerPromptViews::Accept() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // ExperienceSampling: User proceeded through the warning.
+  // ExperienceSampling: User proceeded down the dangerous path.
   sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kProceed);
   RunDone(ACCEPT);
   return true;
 }
 
 bool DownloadDangerPromptViews::Close() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // ExperienceSampling: User canceled the warning.
+  // ExperienceSampling: User did not proceed down the dangerous path.
   sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
   RunDone(DISMISS);
   return true;
 }
 
-views::View* DownloadDangerPromptViews::GetInitiallyFocusedView() {
-  return GetDialogClientView()->cancel_button();
-}
-
 views::View* DownloadDangerPromptViews::GetContentsView() {
   return contents_view_;
 }
 
 views::Widget* DownloadDangerPromptViews::GetWidget() {
   return contents_view_->GetWidget();
 }
 
 const views::Widget* DownloadDangerPromptViews::GetWidget() const {
   return contents_view_->GetWidget();
 }
 
 // content::DownloadItem::Observer:
 void DownloadDangerPromptViews::OnDownloadUpdated(
     content::DownloadItem* download) {
   // If the download is nolonger dangerous (accepted externally) or the download
   // is in a terminal state, then the download danger prompt is no longer
   // necessary.
   if (!download_->IsDangerous() || download_->IsDone()) {
     RunDone(DISMISS);
     Cancel();
   }
 }
 
 base::string16 DownloadDangerPromptViews::GetAcceptButtonTitle() const {
+  // "Be safe".
+  return l10n_util::GetStringUTF16(IDS_CONFIRM_CANCEL_AGAIN_MALICIOUS);
+}
+
+base::string16 DownloadDangerPromptViews::GetCancelButtonTitle() const {
   if (show_context_)
     return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD);
   switch (download_->GetDangerType()) {
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: {
       return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD_AGAIN_MALICIOUS);
     }
     default:
       return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD_AGAIN);
   }
 }
 
-base::string16 DownloadDangerPromptViews::GetCancelButtonTitle() const {
-  if (show_context_)
-    return l10n_util::GetStringUTF16(IDS_CANCEL);
-  switch (download_->GetDangerType()) {
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: {
-      return l10n_util::GetStringUTF16(IDS_CONFIRM_CANCEL_AGAIN_MALICIOUS);
-    }
-    default:
-      return l10n_util::GetStringUTF16(IDS_CANCEL);
-  }
-}
-
 base::string16 DownloadDangerPromptViews::GetMessageLead() const {
   if (!show_context_) {
     switch (download_->GetDangerType()) {
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
         return l10n_util::GetStringUTF16(
             IDS_PROMPT_CONFIRM_KEEP_MALICIOUS_DOWNLOAD_LEAD);
 
       default:
@@ skipping 79 matching lines @@
     content::DownloadItem* item,
     content::WebContents* web_contents,
     bool show_context,
     const OnDone& done) {
   DownloadDangerPromptViews* download_danger_prompt =
       new DownloadDangerPromptViews(item, show_context, done);
   constrained_window::ShowWebModalDialogViews(download_danger_prompt,
                                               web_contents);
   return download_danger_prompt;
 }