Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5042)

Unified Diff: chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc

Issue 1972843002: MacViews GN: Get chrome compiling with mac_views_browser = true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase (patch failure due to r393625) Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc
diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc
similarity index 71%
copy from chrome/browser/download/download_danger_prompt.cc
copy to chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc
index f5b2e8f4b4293a1e97bcbbe635e208337165ac37..b06411f3755955d4aa94af025f80eda76f6aa989 100644
--- a/chrome/browser/download/download_danger_prompt.cc
+++ b/chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc
@@ -1,24 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 "base/macros.h"
-#include "base/metrics/sparse_histogram.h"
-#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_stats.h"
#include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/tab_modal_confirm_dialog.h"
#include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
-#include "chrome/common/safe_browsing/csd.pb.h"
-#include "chrome/common/safe_browsing/download_protection_util.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_context.h"
@@ -26,17 +17,12 @@
#include "content/public/browser/download_item.h"
#include "grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
+#include "url/gurl.h"
using extensions::ExperienceSamplingEvent;
-using safe_browsing::ClientDownloadResponse;
-using safe_browsing::ClientSafeBrowsingReportRequest;
-using safe_browsing::download_protection_util::
- GetSBClientDownloadExtensionValueForUMA;
namespace {
-const char kDownloadDangerPromptPrefix[] = "Download.DownloadDangerPrompt";
-
// TODO(wittman): Create a native web contents modal dialog implementation of
// this dialog for non-Views platforms, to support bold formatting of the
// message lead.
@@ -270,35 +256,8 @@ void DownloadDangerPromptImpl::RunDone(Action action) {
done.Run(action);
}
-// Converts DownloadDangerType into their corresponding string.
-const char* GetDangerTypeString(
- const content::DownloadDangerType& danger_type) {
- switch (danger_type) {
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
- return "DangerousFile";
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
- return "DangerousURL";
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
- return "DangerousContent";
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
- return "DangerousHost";
- case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
- return "UncommonContent";
- case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
- return "PotentiallyUnwanted";
- case content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
- case content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
- case content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
- case content::DOWNLOAD_DANGER_TYPE_MAX:
- break;
- }
- NOTREACHED();
- return nullptr;
-}
-
} // namespace
-#if !defined(USE_AURA)
// static
DownloadDangerPrompt* DownloadDangerPrompt::Create(
content::DownloadItem* item,
@@ -311,57 +270,3 @@ DownloadDangerPrompt* DownloadDangerPrompt::Create(
TabModalConfirmDialog::Create(prompt, web_contents);
return prompt;
}
-#endif
-
-void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
- bool did_proceed,
- const content::DownloadItem& download) {
- safe_browsing::SafeBrowsingService* sb_service =
- g_browser_process->safe_browsing_service();
- ClientSafeBrowsingReportRequest report;
- report.set_type(ClientSafeBrowsingReportRequest::DANGEROUS_DOWNLOAD_RECOVERY);
- switch (download.GetDangerType()) {
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
- report.set_download_verdict(ClientDownloadResponse::DANGEROUS);
- break;
- case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
- report.set_download_verdict(ClientDownloadResponse::UNCOMMON);
- break;
- case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
- report.set_download_verdict(ClientDownloadResponse::POTENTIALLY_UNWANTED);
- break;
- case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
- report.set_download_verdict(ClientDownloadResponse::DANGEROUS_HOST);
- break;
- default:
- break;
- }
- report.set_url(download.GetURL().spec());
- report.set_did_proceed(did_proceed);
-
- std::string serialized_report;
- if (report.SerializeToString(&serialized_report))
- sb_service->SendSerializedDownloadReport(serialized_report);
- else
- DLOG(ERROR) << "Unable to serialize the threat report.";
-}
-
-void DownloadDangerPrompt::RecordDownloadDangerPrompt(
- bool did_proceed,
- const content::DownloadItem& download) {
- int dangerous_file_type =
- GetSBClientDownloadExtensionValueForUMA(download.GetTargetFilePath());
- content::DownloadDangerType danger_type = download.GetDangerType();
-
- UMA_HISTOGRAM_SPARSE_SLOWLY(
- base::StringPrintf("%s.%s.Shown", kDownloadDangerPromptPrefix,
- GetDangerTypeString(danger_type)),
- dangerous_file_type);
- if (did_proceed) {
- UMA_HISTOGRAM_SPARSE_SLOWLY(
- base::StringPrintf("%s.%s.Proceed", kDownloadDangerPromptPrefix,
- GetDangerTypeString(danger_type)),
- dangerous_file_type);
- }
-}

Powered by Google App Engine
This is Rietveld 408576698