Change Dismiss button to Discard and cancel download

chrome/browser/ui/views/download/download_item_view_md.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/views/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 554 matching lines @@
           ExperienceSamplingEvent::kProceed);
       sampling_event_.reset(NULL);
     }
     // This will change the state and notify us.
     download()->ValidateDangerousDownload();
     return;
   }
 
   // WARNING: all end states after this point delete |this|.
   DCHECK_EQ(discard_button_, sender);
-  if (model_.IsMalicious()) {
-    UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration);
-    // ExperienceSampling: User chose to dismiss the dangerous download.
-    if (sampling_event_.get()) {
-      sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
-      sampling_event_.reset(NULL);
-    }
-    shelf_->RemoveDownloadView(this);
-    return;
-  }
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration);
-  if (model_.ShouldAllowDownloadFeedback() &&
+  if (!model_.IsMalicious() && model_.ShouldAllowDownloadFeedback() &&
       !shelf_->browser()->profile()->IsOffTheRecord()) {
     if (!shelf_->browser()->profile()->GetPrefs()->HasPrefPath(
             prefs::kSafeBrowsingExtendedReportingEnabled)) {
       // Show dialog, because the dialog hasn't been shown before.
       DownloadFeedbackDialogView::Show(
           shelf_->get_parent()->GetNativeWindow(), shelf_->browser()->profile(),
           shelf_->GetNavigator(),
           base::Bind(
               &DownloadItemViewMd::PossiblySubmitDownloadToFeedbackService,
               weak_ptr_factory_.GetWeakPtr()));
@@ skipping 371 matching lines @@
   sampling_event_.reset(new ExperienceSamplingEvent(
       event_name, download()->GetURL(), download()->GetReferrerUrl(),
       download()->GetBrowserContext()));
 
   dropdown_state_ = NORMAL;
   if (mode_ == DANGEROUS_MODE) {
     save_button_ = views::MdTextButton::CreateMdButton(
         this, model_.GetWarningConfirmButtonText());
     AddChildView(save_button_);
   }
-  int discard_button_message =
-      model_.IsMalicious() ? IDS_DISMISS_DOWNLOAD : IDS_DISCARD_DOWNLOAD;

[msw, 2016/07/20 20:24:32]

Remove IDS_DISMISS_DOWNLOAD from chrome/app/generated_resources.grd

[Jialiu Lin, 2016/07/20 20:30:01]

Done.

   discard_button_ = views::MdTextButton::CreateMdButton(
-      this, l10n_util::GetStringUTF16(discard_button_message));
+      this, l10n_util::GetStringUTF16(IDS_DISCARD_DOWNLOAD));
   AddChildView(discard_button_);
 
   base::string16 dangerous_label =
       model_.GetWarningText(font_list_, kTextWidth);
   dangerous_download_label_ = new views::Label(dangerous_label);
   dangerous_download_label_->SetMultiLine(true);
   dangerous_download_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   dangerous_download_label_->SetAutoColorReadabilityEnabled(false);
   AddChildView(dangerous_download_label_);
   SizeLabelToMinWidth();
@@ skipping 146 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }