Fix download danger prompt buttons/actions.

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

Index: chrome/browser/ui/views/download/download_danger_prompt_views.cc
diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index 20ce2a2f3d7eccd415db22fd45e8761d414ba07d..467e4fdb6b374ebc5701359450828ed5313b4be1 100644
--- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -55,7 +55,6 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   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;
@@ -139,12 +138,16 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
 void DownloadDangerPromptViews::InvokeActionForTesting(Action action) {
   switch (action) {
     case ACCEPT:
-      Accept();
+      // This inversion is intentional.
+      Cancel();
       break;
 
-    case CANCEL:
     case DISMISS:
-      Cancel();
+      Close();
+      break;
+
+    case CANCEL:
+      Accept();
       break;
 
     default:
@@ -184,17 +187,20 @@ ui::ModalType DownloadDangerPromptViews::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-bool DownloadDangerPromptViews::Cancel() {
+bool DownloadDangerPromptViews::Accept() {
   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);
+  // 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::Accept() {
+bool DownloadDangerPromptViews::Cancel() {
   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;
@@ -202,16 +208,12 @@ bool DownloadDangerPromptViews::Accept() {
 
 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_;
 }
@@ -237,30 +239,21 @@ void DownloadDangerPromptViews::OnDownloadUpdated(
 }
 
 base::string16 DownloadDangerPromptViews::GetAcceptButtonTitle() 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);
-  }
+  // "Be safe".
+  return l10n_util::GetStringUTF16(IDS_CONFIRM_CANCEL_AGAIN_MALICIOUS);
 }
 
 base::string16 DownloadDangerPromptViews::GetCancelButtonTitle() const {
   if (show_context_)
-    return l10n_util::GetStringUTF16(IDS_CANCEL);
+    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_CANCEL_AGAIN_MALICIOUS);
+      return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD_AGAIN_MALICIOUS);
     }
     default:
-      return l10n_util::GetStringUTF16(IDS_CANCEL);
+      return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD_AGAIN);
   }
 }