Compare commits

..
Author SHA1 Message Date
csagan5 0f2a48662d Release 71.0.3578.76 2018-12-04 08:46:51 +01:00
3 changed files with 80 additions and 58 deletions
+2
View File
@@ -1,3 +1,5 @@
# 71.0.3578.76
# 71.0.3578.72
* add flag to disable IPv6 probes
File diff suppressed because one or more lines are too long
@@ -11,7 +11,7 @@ Subject: ungoogled-chromium: disable safe browsing
chrome/browser/chrome_content_browser_client.cc | 32 +---------
.../file_type_policies_component_installer.cc | 14 -----
.../download/chrome_download_manager_delegate.cc | 17 -----
chrome/browser/download/download_item_model.cc | 13 ++--
chrome/browser/download/download_item_model.cc | 3 -
chrome/browser/download/download_prefs.cc | 13 +---
.../browser/download/download_target_determiner.cc | 24 +-------
.../extensions/api/downloads/downloads_api.cc | 39 +-----------
@@ -36,7 +36,7 @@ Subject: ungoogled-chromium: disable safe browsing
.../webui/md_downloads/md_downloads_dom_handler.h | 13 ----
chrome/renderer/chrome_content_renderer_client.cc | 1 -
components/safe_browsing/features.cc | 2 +-
33 files changed, 27 insertions(+), 492 deletions(-)
33 files changed, 22 insertions(+), 487 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
@@ -343,41 +343,6 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -69,7 +69,7 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
- DownloadFileType::DangerLevel danger_level_;
+ safe_browsing::DownloadFileType::DangerLevel danger_level_;
// Whether the download is currently being revived.
bool is_being_revived_;
@@ -106,7 +106,7 @@ DownloadItemModelData::DownloadItemModelData()
: should_show_in_shelf_(true),
was_ui_notified_(false),
should_prefer_opening_in_browser_(false),
- danger_level_(DownloadFileType::NOT_DANGEROUS),
+ danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS),
is_being_revived_(false) {}
} // namespace
@@ -376,13 +376,13 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
data->should_prefer_opening_in_browser_ = preference;
}
-DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
+safe_browsing::DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
- return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
+ return data ? data->danger_level_ : safe_browsing::DownloadFileType::NOT_DANGEROUS;
}
void DownloadItemModel::SetDangerLevel(
- DownloadFileType::DangerLevel danger_level) {
+ safe_browsing::DownloadFileType::DangerLevel danger_level) {
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -534,9 +534,6 @@ bool DownloadItemModel::IsCommandEnabled(
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.