Implement new dangerous download reporting dialog for UNCOMMON_DOWNLOAD, in Views

chrome/browser/download/download_shelf_context_menu.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_shelf_context_menu.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 332 matching lines @@
   return interrupted_download_menu_model_.get();
 }
 
 ui::SimpleMenuModel* DownloadShelfContextMenu::GetMaybeMaliciousMenuModel() {
   if (maybe_malicious_download_menu_model_)
     return maybe_malicious_download_menu_model_.get();
 
   maybe_malicious_download_menu_model_.reset(new ui::SimpleMenuModel(this));
 
   maybe_malicious_download_menu_model_->AddItemWithStringId(
-      DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
-  maybe_malicious_download_menu_model_->AddItemWithStringId(

[Peter Kasting, 2014/02/04 21:56:33]

How come we removed this?

[felt, 2014/02/04 23:37:22]

Previously, the main button said "Report & Discard" and the context menu had the
alternative option "Discard." Now the main button just says "Discard" and the
reporting question happens in the dialog. It would be redundant to have
"Discard" as the main button with "Discard" also in the context menu.

       KEEP, IDS_DOWNLOAD_MENU_KEEP);
   maybe_malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
   maybe_malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
   return maybe_malicious_download_menu_model_.get();
 }
 
 ui::SimpleMenuModel*
 DownloadShelfContextMenu::GetMaliciousMenuModel() {
   if (malicious_download_menu_model_)
     return malicious_download_menu_model_.get();
 
   malicious_download_menu_model_.reset(new ui::SimpleMenuModel(this));
 
   DownloadItemModel download_model(download_item_);
   if (download_model.ShouldAllowDownloadFeedback()) {
     malicious_download_menu_model_->AddItemWithStringId(
         REPORT, IDS_DOWNLOAD_MENU_REPORT);
   }
   malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
 
   return malicious_download_menu_model_.get();
 }