|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
--- a/chrome/browser/BUILD.gn
|
|
|
+++ b/chrome/browser/BUILD.gn
|
|
|
-@@ -606,8 +606,6 @@ static_library("browser") {
|
|
|
+@@ -611,8 +611,6 @@ static_library("browser") {
|
|
|
"internal_auth.h",
|
|
|
"interstitials/chrome_settings_page_helper.cc",
|
|
|
"interstitials/chrome_settings_page_helper.h",
|
|
@@ -11,7 +11,7 @@
|
|
|
"invalidation/profile_invalidation_provider_factory.cc",
|
|
|
"invalidation/profile_invalidation_provider_factory.h",
|
|
|
"k_anonymity_service/k_anonymity_service_client.cc",
|
|
|
-@@ -3640,10 +3638,6 @@ static_library("browser") {
|
|
|
+@@ -3654,10 +3652,6 @@ static_library("browser") {
|
|
|
"enterprise/connectors/analysis/analysis_service_settings.h",
|
|
|
"enterprise/connectors/analysis/analysis_settings.cc",
|
|
|
"enterprise/connectors/analysis/analysis_settings.h",
|
|
@@ -22,7 +22,7 @@
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.cc",
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.h",
|
|
|
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
|
|
|
-@@ -3912,10 +3906,6 @@ static_library("browser") {
|
|
|
+@@ -3932,10 +3926,6 @@ static_library("browser") {
|
|
|
"new_tab_page/modules/recipes/recipes_service_factory.h",
|
|
|
"new_tab_page/modules/recipes/time_format_util.cc",
|
|
|
"new_tab_page/modules/recipes/time_format_util.h",
|
|
@@ -33,15 +33,15 @@
|
|
|
"new_tab_page/new_tab_page_util.cc",
|
|
|
"new_tab_page/new_tab_page_util.h",
|
|
|
"new_tab_page/one_google_bar/one_google_bar_data.cc",
|
|
|
-@@ -4361,7 +4351,6 @@ static_library("browser") {
|
|
|
- "//chrome/browser/new_tab_page/modules/feed:mojo_bindings",
|
|
|
+@@ -4383,7 +4373,6 @@ static_library("browser") {
|
|
|
+ "//chrome/browser/new_tab_page/modules/history_clusters:mojo_bindings",
|
|
|
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
|
|
|
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
|
|
|
- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
|
|
|
"//chrome/browser/policy:path_parser",
|
|
|
"//chrome/browser/profile_resetter:profile_reset_report_proto",
|
|
|
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
|
|
|
-@@ -7563,9 +7552,14 @@ static_library("browser") {
|
|
|
+@@ -7581,9 +7570,14 @@ static_library("browser") {
|
|
|
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
|
|
|
"//components/safe_browsing/content/browser/download:download_stats",
|
|
|
"//components/safe_browsing/content/common:file_type_policies",
|
|
@@ -59,7 +59,7 @@
|
|
|
sources += [
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -4962,11 +4962,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
+@@ -4995,11 +4995,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
&throttles);
|
|
|
#endif
|
|
|
|
|
@@ -73,7 +73,7 @@
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
|
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
|
|
|
-@@ -6487,26 +6489,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
+@@ -6541,26 +6543,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
const std::vector<std::string>& allowlist_domains) {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
|
|
@@ -101,7 +101,7 @@
|
|
|
}
|
|
|
|
|
|
safe_browsing::RealTimeUrlLookupServiceBase*
|
|
|
-@@ -6527,11 +6510,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
+@@ -6581,11 +6564,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
GetForProfile(profile);
|
|
|
}
|
|
|
#endif
|
|
@@ -113,43 +113,6 @@
|
|
|
return nullptr;
|
|
|
}
|
|
|
|
|
|
---- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
|
|
|
-+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
|
|
|
-@@ -144,34 +144,6 @@ void MaybeCreateSafeBrowsingForRenderer(
|
|
|
- const std::vector<std::string>& allowlist_domains)>
|
|
|
- get_checker_delegate,
|
|
|
- mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
|
|
|
-- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
--
|
|
|
-- content::RenderProcessHost* render_process_host =
|
|
|
-- content::RenderProcessHost::FromID(process_id);
|
|
|
-- if (!render_process_host)
|
|
|
-- return;
|
|
|
--
|
|
|
-- PrefService* pref_service =
|
|
|
-- Profile::FromBrowserContext(render_process_host->GetBrowserContext())
|
|
|
-- ->GetPrefs();
|
|
|
--
|
|
|
-- std::vector<std::string> allowlist_domains =
|
|
|
-- safe_browsing::GetURLAllowlistByPolicy(pref_service);
|
|
|
--
|
|
|
-- bool safe_browsing_enabled =
|
|
|
-- safe_browsing::IsSafeBrowsingEnabled(*pref_service);
|
|
|
-- content::GetIOThreadTaskRunner({})->PostTask(
|
|
|
-- FROM_HERE,
|
|
|
-- base::BindOnce(
|
|
|
-- &safe_browsing::MojoSafeBrowsingImpl::MaybeCreate, process_id,
|
|
|
-- resource_context,
|
|
|
-- base::BindRepeating(get_checker_delegate, safe_browsing_enabled,
|
|
|
-- // Navigation initiated from renderer should never
|
|
|
-- // check when safe browsing is disabled, because
|
|
|
-- // enterprise check only supports mainframe URL.
|
|
|
-- /*should_check_on_sb_disabled=*/false,
|
|
|
-- allowlist_domains),
|
|
|
-- std::move(receiver)));
|
|
|
- }
|
|
|
- #endif
|
|
|
-
|
|
|
--- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
|
|
|
+++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
|
|
|
@@ -29,20 +29,6 @@ namespace {
|
|
@@ -185,7 +148,7 @@
|
|
|
|
|
|
--- a/chrome/browser/devtools/devtools_window.cc
|
|
|
+++ b/chrome/browser/devtools/devtools_window.cc
|
|
|
-@@ -73,6 +73,7 @@
|
|
|
+@@ -72,6 +72,7 @@
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
#include "content/public/common/content_client.h"
|
|
|
#include "content/public/common/url_constants.h"
|
|
@@ -195,7 +158,15 @@
|
|
|
#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
|
|
|
--- a/chrome/browser/download/bubble/download_bubble_controller.cc
|
|
|
+++ b/chrome/browser/download/bubble/download_bubble_controller.cc
|
|
|
-@@ -400,8 +400,6 @@ void DownloadBubbleUIController::Process
|
|
|
+@@ -25,7 +25,6 @@
|
|
|
+ #include "chrome/browser/download/offline_item_utils.h"
|
|
|
+ #include "chrome/browser/offline_items_collection/offline_content_aggregator_factory.h"
|
|
|
+ #include "chrome/browser/profiles/profile_key.h"
|
|
|
+-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
|
|
|
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
|
+ #include "chrome/browser/ui/browser.h"
|
|
|
+ #include "chrome/browser/ui/browser_finder.h"
|
|
|
+@@ -458,8 +457,6 @@ void DownloadBubbleUIController::Process
|
|
|
commands.ExecuteCommand(command);
|
|
|
break;
|
|
|
case DownloadCommands::REVIEW:
|
|
@@ -206,15 +177,15 @@
|
|
|
RetryDownload(model, command);
|
|
|
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
|
|
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
|
|
-@@ -133,7 +133,6 @@ using content::DownloadManager;
|
|
|
+@@ -136,7 +136,6 @@ using content::DownloadManager;
|
|
|
using download::DownloadItem;
|
|
|
using download::DownloadPathReservationTracker;
|
|
|
using download::PathValidationResult;
|
|
|
-using safe_browsing::DownloadFileType;
|
|
|
- using safe_browsing::DownloadProtectionService;
|
|
|
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
|
|
|
|
|
|
-@@ -1489,7 +1488,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
|
|
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
+@@ -1496,7 +1495,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
|
|
DownloadItemModel model(item);
|
|
|
model.DetermineAndSetShouldPreferOpeningInBrowser(
|
|
|
target_info->target_path, target_info->is_filetype_handled_safely);
|
|
@@ -222,7 +193,7 @@
|
|
|
}
|
|
|
if (ShouldBlockFile(item, target_info->danger_type)) {
|
|
|
MaybeReportDangerousDownloadBlocked(
|
|
|
-@@ -1568,54 +1566,6 @@ bool ChromeDownloadManagerDelegate::IsOp
|
|
|
+@@ -1575,54 +1573,6 @@ bool ChromeDownloadManagerDelegate::IsOp
|
|
|
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
|
|
|
download::DownloadItem* item,
|
|
|
download::DownloadDangerType danger_type) const {
|
|
@@ -277,7 +248,7 @@
|
|
|
|
|
|
return false;
|
|
|
}
|
|
|
-@@ -1630,7 +1580,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
+@@ -1637,7 +1587,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
service->MaybeSendDangerousDownloadOpenedReport(download,
|
|
|
show_download_in_folder);
|
|
|
}
|
|
@@ -285,7 +256,7 @@
|
|
|
if (!download->GetAutoOpened()) {
|
|
|
download::DownloadContent download_content =
|
|
|
download::DownloadContentFromMimeType(download->GetMimeType(), false);
|
|
|
-@@ -1638,6 +1587,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
+@@ -1645,6 +1594,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
download->GetDangerType(), download_content, base::Time::Now(),
|
|
|
download->GetEndTime(), show_download_in_folder);
|
|
|
}
|
|
@@ -293,7 +264,7 @@
|
|
|
}
|
|
|
|
|
|
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
|
|
|
-@@ -1695,8 +1645,7 @@ void ChromeDownloadManagerDelegate::Chec
|
|
|
+@@ -1702,8 +1652,7 @@ void ChromeDownloadManagerDelegate::Chec
|
|
|
DCHECK(download_item);
|
|
|
DCHECK(download_item->IsSavePackageDownload());
|
|
|
|
|
@@ -305,7 +276,7 @@
|
|
|
|
|
|
--- a/chrome/browser/download/download_item_model.cc
|
|
|
+++ b/chrome/browser/download/download_item_model.cc
|
|
|
-@@ -917,100 +917,10 @@ void DownloadItemModel::ExecuteCommand(D
|
|
|
+@@ -926,101 +926,10 @@ void DownloadItemModel::ExecuteCommand(D
|
|
|
|
|
|
DownloadItemModel::BubbleUIInfo
|
|
|
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
|
|
@@ -320,7 +291,8 @@
|
|
|
- return DownloadUIModel::BubbleUIInfo(
|
|
|
- l10n_util::GetStringUTF16(
|
|
|
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SUSPICIOUS_ARCHIVE))
|
|
|
-- .AddIconAndColor(views::kInfoIcon, ui::kColorAlertMediumSeverity)
|
|
|
+- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
|
|
|
+- ui::kColorAlertMediumSeverity)
|
|
|
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
|
|
|
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
|
|
|
- DownloadCommands::Command::DISCARD,
|
|
@@ -353,7 +325,7 @@
|
|
|
- l10n_util::GetStringFUTF16(
|
|
|
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT_AND_ACCOUNT,
|
|
|
- base::ASCIIToUTF16(email)))
|
|
|
-- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
|
|
|
+- .AddIconAndColor(vector_icons::kDangerousIcon,
|
|
|
- ui::kColorAlertHighSeverity)
|
|
|
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
|
|
|
- .AddSubpageButton(
|
|
@@ -365,7 +337,7 @@
|
|
|
- return DownloadUIModel::BubbleUIInfo(
|
|
|
- l10n_util::GetStringUTF16(
|
|
|
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT))
|
|
|
-- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
|
|
|
+- .AddIconAndColor(vector_icons::kDangerousIcon,
|
|
|
- ui::kColorAlertHighSeverity)
|
|
|
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
|
|
|
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
|
|
@@ -429,7 +401,7 @@
|
|
|
void RecordOpenedDangerousConfirmDialog(
|
|
|
--- a/chrome/browser/download/download_target_determiner.cc
|
|
|
+++ b/chrome/browser/download/download_target_determiner.cc
|
|
|
-@@ -989,12 +989,14 @@ void DownloadTargetDeterminer::CheckVisi
|
|
|
+@@ -995,12 +995,14 @@ void DownloadTargetDeterminer::CheckVisi
|
|
|
bool visited_referrer_before) {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
|
|
@@ -444,7 +416,7 @@
|
|
|
danger_level_ = GetDangerLevel(
|
|
|
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
|
|
|
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
|
|
|
-@@ -1266,6 +1268,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
+@@ -1272,6 +1274,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
|
|
|
absl::optional<base::Time>
|
|
|
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
|
@@ -452,7 +424,7 @@
|
|
|
safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
|
|
|
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
|
|
|
GetProfile());
|
|
|
-@@ -1274,6 +1277,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
+@@ -1280,6 +1283,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
safe_browsing::SafeBrowsingMetricsCollector::
|
|
|
EventType::DANGEROUS_DOWNLOAD_BYPASS)
|
|
|
: absl::nullopt;
|
|
@@ -487,7 +459,57 @@
|
|
|
std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
|
|
|
--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc
|
|
|
-@@ -236,14 +236,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
|
|
+@@ -158,49 +158,12 @@ void FilesRequestHandler::FileRequestCal
|
|
|
+ }
|
|
|
+
|
|
|
+ bool FilesRequestHandler::UploadDataImpl() {
|
|
|
+- safe_browsing::IncrementCrashKey(
|
|
|
+- safe_browsing::ScanningCrashKey::PENDING_FILE_UPLOADS, paths_.size());
|
|
|
+-
|
|
|
+- if (!paths_.empty()) {
|
|
|
+- safe_browsing::IncrementCrashKey(
|
|
|
+- safe_browsing::ScanningCrashKey::TOTAL_FILE_UPLOADS, paths_.size());
|
|
|
+-
|
|
|
+- std::vector<safe_browsing::FileOpeningJob::FileOpeningTask> tasks(
|
|
|
+- paths_.size());
|
|
|
+- for (size_t i = 0; i < paths_.size(); ++i)
|
|
|
+- tasks[i].request = PrepareFileRequest(i);
|
|
|
+-
|
|
|
+- file_opening_job_ =
|
|
|
+- std::make_unique<safe_browsing::FileOpeningJob>(std::move(tasks));
|
|
|
+- return true;
|
|
|
+- }
|
|
|
+-
|
|
|
+ // If zero files were passed to the FilesRequestHandler, we call the callback
|
|
|
+ // directly.
|
|
|
+ MaybeCompleteScanRequest();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+-safe_browsing::FileAnalysisRequest* FilesRequestHandler::PrepareFileRequest(
|
|
|
+- size_t index) {
|
|
|
+- DCHECK_LT(index, paths_.size());
|
|
|
+- base::FilePath path = paths_[index];
|
|
|
+- auto request = std::make_unique<safe_browsing::FileAnalysisRequest>(
|
|
|
+- *analysis_settings_, path, path.BaseName(), /*mime_type*/ "",
|
|
|
+- /* delay_opening_file */ true,
|
|
|
+- base::BindOnce(&FilesRequestHandler::FileRequestCallback,
|
|
|
+- weak_ptr_factory_.GetWeakPtr(), index),
|
|
|
+- base::BindOnce(&FilesRequestHandler::FileRequestStartCallback,
|
|
|
+- weak_ptr_factory_.GetWeakPtr(), index));
|
|
|
+- safe_browsing::FileAnalysisRequest* request_raw = request.get();
|
|
|
+- PrepareRequest(AccessPointToEnterpriseConnector(access_point_), request_raw);
|
|
|
+- request_raw->GetRequestData(base::BindOnce(
|
|
|
+- &FilesRequestHandler::OnGotFileInfo, weak_ptr_factory_.GetWeakPtr(),
|
|
|
+- std::move(request), index));
|
|
|
+-
|
|
|
+- return request_raw;
|
|
|
+-}
|
|
|
+-
|
|
|
+ void FilesRequestHandler::OnGotFileInfo(
|
|
|
+ std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
|
|
|
+ size_t index,
|
|
|
+@@ -236,14 +199,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
|
|
void FilesRequestHandler::FinishRequestEarly(
|
|
|
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
|
|
|
safe_browsing::BinaryUploadService::Result result) {
|
|
@@ -502,9 +524,22 @@
|
|
|
request->FinishRequest(result,
|
|
|
enterprise_connectors::ContentAnalysisResponse());
|
|
|
}
|
|
|
+--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.h
|
|
|
++++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.h
|
|
|
+@@ -110,10 +110,6 @@ class FilesRequestHandler : public Reque
|
|
|
+ enterprise_connectors::ContentAnalysisResponse response);
|
|
|
+
|
|
|
+ private:
|
|
|
+- // Prepares an upload request for the file at `path`. If the file
|
|
|
+- // cannot be uploaded it will have a failure verdict added to `result_`.
|
|
|
+- safe_browsing::FileAnalysisRequest* PrepareFileRequest(size_t index);
|
|
|
+-
|
|
|
+ // Called when the file info for `path` has been fetched. Also begins the
|
|
|
+ // upload process.
|
|
|
+ void OnGotFileInfo(
|
|
|
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
-@@ -407,19 +407,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
+@@ -413,19 +413,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
return absl::nullopt;
|
|
|
}
|
|
|
|
|
@@ -586,7 +621,7 @@
|
|
|
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
|
|
|
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
|
|
-@@ -387,7 +387,7 @@ void RealtimeReportingClient::ReportReal
|
|
|
+@@ -406,7 +406,7 @@ void RealtimeReportingClient::ReportEven
|
|
|
}
|
|
|
|
|
|
std::string RealtimeReportingClient::GetProfileUserName() const {
|
|
@@ -744,8 +779,8 @@
|
|
|
"pending_extension_info.cc",
|
|
|
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
|
|
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
|
|
-@@ -87,7 +87,6 @@ void EnsureApiBrowserContextKeyedService
|
|
|
- extensions::PasswordsPrivateEventRouterFactory::GetInstance();
|
|
|
+@@ -95,7 +95,6 @@ void EnsureApiBrowserContextKeyedService
|
|
|
+ #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
|
|
extensions::PreferenceAPI::GetFactoryInstance();
|
|
|
extensions::ProcessesAPI::GetFactoryInstance();
|
|
|
- extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
|
|
@@ -776,7 +811,7 @@
|
|
|
}
|
|
|
|
|
|
CookiesGetAllFunction::CookiesGetAllFunction() {
|
|
|
-@@ -383,26 +368,6 @@ void CookiesGetAllFunction::GetCookieLis
|
|
|
+@@ -377,26 +362,6 @@ void CookiesGetAllFunction::GetCookieLis
|
|
|
}
|
|
|
|
|
|
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
|
|
@@ -825,7 +860,7 @@
|
|
|
info.enterprise_profile_id = signals.enterprise_profile_id;
|
|
|
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
-@@ -703,56 +703,17 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
+@@ -705,56 +705,17 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
content::BrowserContext* context,
|
|
|
const ExtensionId& extension_id,
|
|
|
const std::string& code) const {
|
|
@@ -892,8 +927,8 @@
|
|
|
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
|
|
|
#include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
#include "chrome/browser/extensions/permissions_updater.h"
|
|
|
- #include "chrome/browser/extensions/shared_module_service.h"
|
|
|
-@@ -192,7 +191,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
+ #include "chrome/browser/extensions/profile_util.h"
|
|
|
+@@ -194,7 +193,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
|
|
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
|
|
|
extension_prefs_);
|
|
@@ -901,7 +936,7 @@
|
|
|
}
|
|
|
|
|
|
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
|
|
|
-@@ -358,9 +356,6 @@ ExtensionService::ExtensionService(Profi
|
|
|
+@@ -362,9 +360,6 @@ ExtensionService::ExtensionService(
|
|
|
safe_browsing_verdict_handler_(extension_prefs,
|
|
|
ExtensionRegistry::Get(profile),
|
|
|
this),
|
|
@@ -911,7 +946,7 @@
|
|
|
registry_(ExtensionRegistry::Get(profile)),
|
|
|
pending_extension_manager_(profile),
|
|
|
install_directory_(install_directory),
|
|
|
-@@ -856,100 +851,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
+@@ -861,100 +856,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
return extension_registrar_.IsExtensionEnabled(extension_id);
|
|
|
}
|
|
|
|
|
@@ -1021,8 +1056,8 @@
|
|
|
-#include "chrome/browser/extensions/omaha_attributes_handler.h"
|
|
|
#include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
|
|
|
- #include "chrome/browser/profiles/profile_manager.h"
|
|
|
-@@ -278,40 +277,11 @@ class ExtensionService : public Extensio
|
|
|
+ #include "chrome/browser/profiles/profile_manager_observer.h"
|
|
|
+@@ -279,40 +278,11 @@ class ExtensionService : public Extensio
|
|
|
// nothing.
|
|
|
void EnableExtension(const std::string& extension_id);
|
|
|
|
|
@@ -1063,7 +1098,7 @@
|
|
|
// Disables the extension. If the extension is already disabled, just adds
|
|
|
// the |disable_reasons| (a bitmask of disable_reason::DisableReason - there
|
|
|
// can be multiple DisableReasons e.g. when an extension comes in disabled
|
|
|
-@@ -655,8 +625,6 @@ class ExtensionService : public Extensio
|
|
|
+@@ -661,8 +631,6 @@ class ExtensionService : public Extensio
|
|
|
|
|
|
SafeBrowsingVerdictHandler safe_browsing_verdict_handler_;
|
|
|
|
|
@@ -1074,7 +1109,7 @@
|
|
|
|
|
|
--- a/chrome/browser/extensions/extension_system_impl.cc
|
|
|
+++ b/chrome/browser/extensions/extension_system_impl.cc
|
|
|
-@@ -464,8 +464,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
+@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
|
|
|
const std::string& extension_id,
|
|
|
const base::Value& attributes) {
|
|
@@ -1119,16 +1154,15 @@
|
|
|
}
|
|
|
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
|
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
|
-@@ -32,8 +32,6 @@
|
|
|
+@@ -32,7 +32,6 @@
|
|
|
#include "chrome/browser/download/download_prefs.h"
|
|
|
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
--#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
|
|
|
--#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
|
+-#include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
|
|
|
#include "chrome/browser/ui/file_system_access_dialogs.h"
|
|
|
#include "chrome/common/chrome_paths.h"
|
|
|
#include "chrome/common/pdf_util.h"
|
|
|
-@@ -394,85 +392,6 @@ bool ShouldBlockAccessToPath(const base:
|
|
|
+@@ -398,85 +397,6 @@ bool ShouldBlockAccessToPath(const base:
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -1214,7 +1248,7 @@
|
|
|
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
|
|
|
return id.empty() ? kDefaultLastPickedDirectoryKey
|
|
|
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
|
|
|
-@@ -492,13 +411,7 @@ base::StringPiece GetGrantKeyFromGrantTy
|
|
|
+@@ -496,13 +416,7 @@ base::StringPiece GetGrantKeyFromGrantTy
|
|
|
bool FileHasDangerousExtension(const url::Origin& origin,
|
|
|
const base::FilePath& path,
|
|
|
Profile* profile) {
|
|
@@ -1229,7 +1263,7 @@
|
|
|
}
|
|
|
|
|
|
} // namespace
|
|
|
-@@ -1328,29 +1241,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
+@@ -1334,29 +1248,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
std::move(callback));
|
|
|
}
|
|
|
|
|
@@ -1274,15 +1308,15 @@
|
|
|
|
|
|
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
|
|
|
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
|
|
|
-@@ -24,6 +24,7 @@
|
|
|
+@@ -23,6 +23,7 @@
|
|
|
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
|
|
|
#include "chrome/common/pref_names.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
+#include "components/safe_browsing/buildflags.h"
|
|
|
#include "components/url_formatter/elide_url.h"
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
- #include "content/public/browser/desktop_capture.h"
|
|
|
-@@ -112,6 +113,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
+ #include "content/public/browser/desktop_media_id.h"
|
|
|
+@@ -110,6 +111,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -1290,7 +1324,7 @@
|
|
|
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
|
|
// warnings until user interaction. If the current page has a delayed warning,
|
|
|
// it'll have a user interaction observer attached. Show the warning
|
|
|
-@@ -127,6 +129,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
+@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
observer->OnDesktopCaptureRequest();
|
|
|
return;
|
|
|
}
|
|
@@ -1324,7 +1358,7 @@
|
|
|
#include "chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h"
|
|
|
#include "chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.h"
|
|
|
#include "chrome/browser/safe_browsing/extension_telemetry/password_reuse_signal.h"
|
|
|
-@@ -901,6 +900,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
+@@ -886,6 +885,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
return autofill::LanguageCode();
|
|
|
}
|
|
|
|
|
@@ -1332,7 +1366,7 @@
|
|
|
safe_browsing::PasswordProtectionService*
|
|
|
ChromePasswordManagerClient::GetPasswordProtectionService() const {
|
|
|
return safe_browsing::ChromePasswordProtectionService::
|
|
|
-@@ -974,13 +974,9 @@ void ChromePasswordManagerClient::CheckP
|
|
|
+@@ -959,13 +959,9 @@ void ChromePasswordManagerClient::CheckP
|
|
|
telemetry_service->AddSignal(std::move(password_reuse_signal));
|
|
|
#endif // !BUILDFLAG(IS_ANDROID)
|
|
|
}
|
|
@@ -1347,7 +1381,7 @@
|
|
|
}
|
|
|
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
-@@ -989,36 +985,10 @@ void ChromePasswordManagerClient::MaybeR
|
|
|
+@@ -974,36 +970,10 @@ void ChromePasswordManagerClient::MaybeR
|
|
|
bool is_federated,
|
|
|
const url::Origin& federated_origin,
|
|
|
const std::u16string& login_user_name) const {
|
|
@@ -1384,7 +1418,7 @@
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-@@ -1526,7 +1496,9 @@ void ChromePasswordManagerClient::OnPast
|
|
|
+@@ -1511,7 +1481,9 @@ void ChromePasswordManagerClient::OnPast
|
|
|
}
|
|
|
|
|
|
was_on_paste_called_ = true;
|
|
@@ -1394,7 +1428,7 @@
|
|
|
}
|
|
|
|
|
|
void ChromePasswordManagerClient::RenderFrameCreated(
|
|
|
-@@ -1562,7 +1534,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
+@@ -1547,7 +1519,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
|
|
|
OnPaste();
|
|
|
} else {
|
|
@@ -1404,7 +1438,7 @@
|
|
|
}
|
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
|
|
}
|
|
|
-@@ -1593,6 +1567,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1578,6 +1552,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
is_enabled = false;
|
|
|
}
|
|
|
|
|
@@ -1412,7 +1446,7 @@
|
|
|
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
|
|
// warnings until user interaction. If the current page has a delayed warning,
|
|
|
// it'll have a user interaction observer attached. Disable password
|
|
|
-@@ -1603,6 +1578,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1588,6 +1563,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
observer->OnPasswordSaveOrAutofillDenied();
|
|
|
is_enabled = false;
|
|
|
}
|
|
@@ -1617,7 +1651,7 @@
|
|
|
}
|
|
|
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
-@@ -96,6 +96,7 @@
|
|
|
+@@ -94,6 +94,7 @@
|
|
|
#include "components/policy/policy_constants.h"
|
|
|
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
|
|
|
#include "components/proxy_config/proxy_policy_handler.h"
|
|
@@ -1625,7 +1659,7 @@
|
|
|
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
|
|
|
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
|
|
|
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
-@@ -1904,8 +1905,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1930,8 +1931,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
handlers->AddHandler(
|
|
|
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
|
|
chrome_schema));
|
|
@@ -1634,7 +1668,7 @@
|
|
|
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
|
|
|
handlers->AddHandler(
|
|
|
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
|
|
-@@ -1963,13 +1962,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1990,13 +1989,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
|
|
|
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
|
|
|
|
|
@@ -1650,7 +1684,7 @@
|
|
|
|
|
|
--- a/chrome/browser/prefs/browser_prefs.cc
|
|
|
+++ b/chrome/browser/prefs/browser_prefs.cc
|
|
|
-@@ -265,7 +265,6 @@
|
|
|
+@@ -263,7 +263,6 @@
|
|
|
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
|
|
|
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
|
|
|
#include "chrome/browser/new_tab_page/modules/recipes/recipes_service.h"
|
|
@@ -1658,7 +1692,7 @@
|
|
|
#include "chrome/browser/new_tab_page/promos/promo_service.h"
|
|
|
#include "chrome/browser/policy/developer_tools_policy_handler.h"
|
|
|
#include "chrome/browser/search/background/ntp_custom_background_service.h"
|
|
|
-@@ -1547,7 +1546,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -1485,7 +1484,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
NewTabPageHandler::RegisterProfilePrefs(registry);
|
|
|
NewTabPageUI::RegisterProfilePrefs(registry);
|
|
|
NewTabUI::RegisterProfilePrefs(registry);
|
|
@@ -1668,7 +1702,22 @@
|
|
|
PinnedTabCodec::RegisterProfilePrefs(registry);
|
|
|
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|
|
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|
|
-@@ -602,7 +602,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
+@@ -829,13 +829,13 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
+ safe_browsing::CloudBinaryUploadServiceFactory::GetInstance();
|
|
|
+ safe_browsing::ExtensionTelemetryServiceFactory::GetInstance();
|
|
|
+ safe_browsing::HashRealTimeServiceFactory::GetInstance();
|
|
|
+-#endif
|
|
|
+ safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance();
|
|
|
+ safe_browsing::ClientSideDetectionServiceFactory::GetInstance();
|
|
|
+ safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance();
|
|
|
+ safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance();
|
|
|
+ safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance();
|
|
|
+ safe_browsing::VerdictCacheManagerFactory::GetInstance();
|
|
|
++#endif
|
|
|
+ #if BUILDFLAG(IS_MAC)
|
|
|
+ if (screentime::IsScreenTimeEnabled()) {
|
|
|
+ screentime::HistoryBridgeFactory::GetInstance();
|
|
|
+@@ -884,7 +884,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
}
|
|
|
#endif
|
|
|
TabRestoreServiceFactory::GetInstance();
|
|
@@ -1678,7 +1727,7 @@
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
--- a/chrome/browser/resources/settings/lazy_load.ts
|
|
|
+++ b/chrome/browser/resources/settings/lazy_load.ts
|
|
|
-@@ -167,7 +167,6 @@ export {SettingsPrivacyGuideDialogElemen
|
|
|
+@@ -170,7 +170,6 @@ export {SettingsPrivacyGuideDialogElemen
|
|
|
export {PrivacyGuideHistorySyncFragmentElement} from './privacy_page/privacy_guide/privacy_guide_history_sync_fragment.js';
|
|
|
export {PrivacyGuideMsbbFragmentElement} from './privacy_page/privacy_guide/privacy_guide_msbb_fragment.js';
|
|
|
export {SettingsPrivacyGuidePageElement} from './privacy_page/privacy_guide/privacy_guide_page.js';
|
|
@@ -1696,6 +1745,40 @@
|
|
|
import './privacy_guide_welcome_fragment.js';
|
|
|
import './step_indicator.js';
|
|
|
|
|
|
+--- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
|
|
++++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
|
|
+@@ -71,10 +71,6 @@ void FileOpeningJob::ProcessNextTask(bas
|
|
|
+ if (tasks_[i].taken.exchange(true, std::memory_order_relaxed))
|
|
|
+ continue;
|
|
|
+
|
|
|
+- // Since we know we now have taken `tasks_[i]`, we can do the file opening
|
|
|
+- // work safely.
|
|
|
+- tasks_[i].request->OpenFile();
|
|
|
+-
|
|
|
+ // Now that the file opening work is done, `num_unopened_files_` is
|
|
|
+ // decremented atomically and we return to free the thread.
|
|
|
+ num_unopened_files_.fetch_sub(1, std::memory_order_relaxed);
|
|
|
+--- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.h
|
|
|
++++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.h
|
|
|
+@@ -11,7 +11,6 @@
|
|
|
+ #include "base/gtest_prod_util.h"
|
|
|
+ #include "base/memory/raw_ptr.h"
|
|
|
+ #include "base/task/post_job.h"
|
|
|
+-#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
|
|
|
+
|
|
|
+ namespace safe_browsing {
|
|
|
+
|
|
|
+@@ -24,10 +23,6 @@ class FileOpeningJob {
|
|
|
+ FileOpeningTask();
|
|
|
+ ~FileOpeningTask();
|
|
|
+
|
|
|
+- // Non-owning pointer to the request corresponding to the file to open.
|
|
|
+- raw_ptr<safe_browsing::FileAnalysisRequest, DanglingUntriaged> request =
|
|
|
+- nullptr;
|
|
|
+-
|
|
|
+ // Indicates if this task has been taken and is owned by a thread.
|
|
|
+ std::atomic_bool taken{false};
|
|
|
+ };
|
|
|
--- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
|
|
|
+++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
|
|
|
@@ -17,15 +17,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi
|
|
@@ -1851,7 +1934,7 @@
|
|
|
} // namespace
|
|
|
--- a/chrome/browser/ui/BUILD.gn
|
|
|
+++ b/chrome/browser/ui/BUILD.gn
|
|
|
-@@ -555,7 +555,6 @@ static_library("ui") {
|
|
|
+@@ -558,7 +558,6 @@ static_library("ui") {
|
|
|
"//components/renderer_context_menu",
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -1859,7 +1942,7 @@
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
"//components/safe_browsing/core/browser/db:database_manager",
|
|
|
-@@ -3513,8 +3512,6 @@ static_library("ui") {
|
|
|
+@@ -3542,8 +3541,6 @@ static_library("ui") {
|
|
|
"startup/web_app_startup_utils.h",
|
|
|
"tab_contents/chrome_web_contents_menu_helper.cc",
|
|
|
"tab_contents/chrome_web_contents_menu_helper.h",
|
|
@@ -1868,7 +1951,7 @@
|
|
|
"views/autofill/payments/virtual_card_selection_dialog_view.cc",
|
|
|
"views/autofill/payments/virtual_card_selection_dialog_view.h",
|
|
|
"views/autofill/payments/webauthn_dialog_view.cc",
|
|
|
-@@ -4970,8 +4967,6 @@ static_library("ui") {
|
|
|
+@@ -5018,8 +5015,6 @@ static_library("ui") {
|
|
|
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
|
|
|
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
|
|
|
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
|
|
@@ -1905,7 +1988,15 @@
|
|
|
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
|
|
|
--- a/chrome/browser/ui/views/download/download_item_view.cc
|
|
|
+++ b/chrome/browser/ui/views/download/download_item_view.cc
|
|
|
-@@ -815,9 +815,7 @@ void DownloadItemView::UpdateLabels() {
|
|
|
+@@ -38,7 +38,6 @@
|
|
|
+ #include "chrome/browser/icon_manager.h"
|
|
|
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
|
|
|
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
|
|
|
+-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
|
|
|
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
|
+ #include "chrome/browser/ui/browser.h"
|
|
|
+ #include "chrome/browser/ui/color/chrome_color_id.h"
|
|
|
+@@ -815,9 +814,7 @@ void DownloadItemView::UpdateLabels() {
|
|
|
deep_scanning_label_->SetVisible(mode_ ==
|
|
|
download::DownloadItemMode::kDeepScanning);
|
|
|
if (deep_scanning_label_->GetVisible()) {
|
|
@@ -1916,7 +2007,7 @@
|
|
|
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
|
|
|
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
|
|
|
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
|
|
|
-@@ -843,11 +841,15 @@ void DownloadItemView::UpdateButtons() {
|
|
|
+@@ -843,11 +840,15 @@ void DownloadItemView::UpdateButtons() {
|
|
|
}
|
|
|
|
|
|
const bool allow_open_during_deep_scan =
|
|
@@ -1932,7 +2023,7 @@
|
|
|
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
|
|
|
prompt_to_scan || allow_open_during_deep_scan);
|
|
|
|
|
|
-@@ -1270,7 +1272,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
+@@ -1270,7 +1271,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
}
|
|
|
|
|
|
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
|
|
@@ -2076,7 +2167,7 @@
|
|
|
std::move(callback),
|
|
|
--- a/chrome/test/BUILD.gn
|
|
|
+++ b/chrome/test/BUILD.gn
|
|
|
-@@ -1406,7 +1406,6 @@ if (!is_android) {
|
|
|
+@@ -1466,7 +1466,6 @@ if (!is_android) {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -2084,7 +2175,7 @@
|
|
|
"//components/safe_browsing/content/browser:safe_browsing_service",
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/password_protection:test_support",
|
|
|
-@@ -5988,7 +5987,6 @@ test("unit_tests") {
|
|
|
+@@ -6082,7 +6081,6 @@ test("unit_tests") {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -2094,7 +2185,7 @@
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
-@@ -442,7 +442,7 @@ void ContentPasswordManagerDriver::Check
|
|
|
+@@ -452,7 +452,7 @@ void ContentPasswordManagerDriver::Check
|
|
|
if (!password_manager::bad_message::CheckFrameNotPrerendering(
|
|
|
render_frame_host_))
|
|
|
return;
|
|
@@ -2188,7 +2279,7 @@
|
|
|
- "user_population.h",
|
|
|
]
|
|
|
|
|
|
- public_deps = [ "//google_apis:google_apis" ]
|
|
|
+ configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
|
|
--- a/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h
|
|
|
+++ b/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h
|
|
|
@@ -5,6 +5,7 @@
|
|
@@ -2311,17 +2402,17 @@
|
|
|
// possible to request one. This is used to block file dialogs from being
|
|
|
--- a/extensions/browser/updater/update_service.cc
|
|
|
+++ b/extensions/browser/updater/update_service.cc
|
|
|
-@@ -125,14 +125,6 @@ void UpdateService::OnEvent(Events event
|
|
|
+@@ -131,14 +131,6 @@ void UpdateService::OnCrxStateChange(Upd
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if (should_perform_action_on_omaha_attributes) {
|
|
|
-- base::Value::Dict attributes = GetExtensionOmahaAttributes(extension_id);
|
|
|
+- base::Value::Dict attributes = GetExtensionOmahaAttributes(item);
|
|
|
- // Note that it's important to perform actions even if |attributes| is
|
|
|
- // empty, missing values may default to false and have associated logic.
|
|
|
- ExtensionSystem::Get(browser_context_)
|
|
|
- ->PerformActionBasedOnOmahaAttributes(
|
|
|
-- extension_id, base::Value(std::move(attributes)));
|
|
|
+- item.id, base::Value(std::move(attributes)));
|
|
|
- }
|
|
|
}
|
|
|
|
|
@@ -2339,7 +2430,7 @@
|
|
|
declare_args() {
|
|
|
--- a/weblayer/BUILD.gn
|
|
|
+++ b/weblayer/BUILD.gn
|
|
|
-@@ -468,7 +468,6 @@ source_set("weblayer_lib_base") {
|
|
|
+@@ -470,7 +470,6 @@ source_set("weblayer_lib_base") {
|
|
|
"//components/profile_metrics",
|
|
|
"//components/reduce_accept_language/browser",
|
|
|
"//components/safe_browsing/content/browser",
|