diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/downloads/downloads_api.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/downloads/downloads_api.cc | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/chromium/chrome/browser/extensions/api/downloads/downloads_api.cc b/chromium/chrome/browser/extensions/api/downloads/downloads_api.cc index 7ba05fc5f7a..9a908ac71c4 100644 --- a/chromium/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chromium/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -70,7 +70,6 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function_dispatcher.h" #include "extensions/browser/extension_prefs.h" -#include "extensions/browser/extension_registry.h" #include "extensions/browser/notification_types.h" #include "extensions/browser/warning_service.h" #include "extensions/common/permissions/permissions_data.h" @@ -149,6 +148,11 @@ const char kDangerUnwanted[] = "unwanted"; const char kDangerWhitelistedByPolicy[] = "whitelistedByPolicy"; const char kDangerAsyncScanning[] = "asyncScanning"; const char kDangerPasswordProtected[] = "passwordProtected"; +const char kDangerTooLarge[] = "blockedTooLarge"; +const char kDangerSensitiveContentWarning[] = "sensitiveContentWarning"; +const char kDangerSensitiveContentBlock[] = "sensitiveContentBlock"; +const char kDangerDeepScannedSafe[] = "deepScannedSafe"; +const char kDangerDeepScannedOpenedDangerous[] = "deepScannedOpenedDangerous"; const char kDangerUrl[] = "url"; const char kEndTimeKey[] = "endTime"; const char kEndedAfterKey[] = "endedAfter"; @@ -182,13 +186,23 @@ const char kFinalUrlRegexKey[] = "finalUrlRegex"; // Note: Any change to the danger type strings, should be accompanied by a // corresponding change to downloads.json. -const char* const kDangerStrings[] = { - kDangerSafe, kDangerFile, - kDangerUrl, kDangerContent, - kDangerSafe, kDangerUncommon, - kDangerAccepted, kDangerHost, - kDangerUnwanted, kDangerWhitelistedByPolicy, - kDangerAsyncScanning, kDangerPasswordProtected}; +const char* const kDangerStrings[] = {kDangerSafe, + kDangerFile, + kDangerUrl, + kDangerContent, + kDangerSafe, + kDangerUncommon, + kDangerAccepted, + kDangerHost, + kDangerUnwanted, + kDangerWhitelistedByPolicy, + kDangerAsyncScanning, + kDangerPasswordProtected, + kDangerTooLarge, + kDangerSensitiveContentWarning, + kDangerSensitiveContentBlock, + kDangerDeepScannedSafe, + kDangerDeepScannedOpenedDangerous}; static_assert(base::size(kDangerStrings) == download::DOWNLOAD_DANGER_TYPE_MAX, "kDangerStrings should have DOWNLOAD_DANGER_TYPE_MAX elements"); @@ -396,7 +410,7 @@ void InitFilterTypeMap(FilterTypeMap* filter_types_ptr) { AppendFilter(kFinalUrlKey, DownloadQuery::FILTER_URL, &v); AppendFilter(kFinalUrlRegexKey, DownloadQuery::FILTER_URL_REGEX, &v); - *filter_types_ptr = FilterTypeMap(std::move(v), base::KEEP_FIRST_OF_DUPES); + *filter_types_ptr = FilterTypeMap(std::move(v)); } using SortTypeMap = base::flat_map<std::string, DownloadQuery::SortType>; @@ -423,7 +437,7 @@ void InitSortTypeMap(SortTypeMap* sorter_types_ptr) { AppendFilter(kUrlKey, DownloadQuery::SORT_ORIGINAL_URL, &v); AppendFilter(kFinalUrlKey, DownloadQuery::SORT_URL, &v); - *sorter_types_ptr = SortTypeMap(std::move(v), base::KEEP_FIRST_OF_DUPES); + *sorter_types_ptr = SortTypeMap(std::move(v)); } bool IsNotTemporaryDownloadFilter(const DownloadItem& download_item) { @@ -1611,9 +1625,7 @@ void DownloadsGetFileIconFunction::OnIconURLExtracted(const std::string& url) { ExtensionDownloadsEventRouter::ExtensionDownloadsEventRouter( Profile* profile, DownloadManager* manager) - : profile_(profile), - notifier_(manager, this), - extension_registry_observer_(this) { + : profile_(profile), notifier_(manager, this) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(profile_); extension_registry_observer_.Add(ExtensionRegistry::Get(profile_)); |