|
|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
--- a/chrome/browser/BUILD.gn
|
|
|
+++ b/chrome/browser/BUILD.gn
|
|
|
-@@ -1957,7 +1957,6 @@ static_library("browser") {
|
|
|
+@@ -1949,7 +1949,6 @@ static_library("browser") {
|
|
|
"//chrome/browser/net:probe_message_proto",
|
|
|
"//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
|
|
|
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
|
|
|
@@ -10,7 +10,7 @@
|
|
|
"//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
|
|
|
"//chrome/browser/notifications",
|
|
|
"//chrome/browser/notifications/scheduler:factory",
|
|
|
-@@ -3778,9 +3777,6 @@ static_library("browser") {
|
|
|
+@@ -3757,9 +3756,6 @@ static_library("browser") {
|
|
|
"download/offline_item_model_manager_factory.h",
|
|
|
"enterprise/connectors/analysis/analysis_service_settings.cc",
|
|
|
"enterprise/connectors/analysis/analysis_service_settings.h",
|
|
|
@@ -20,7 +20,7 @@
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.cc",
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.h",
|
|
|
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
|
|
|
-@@ -4023,10 +4019,6 @@ static_library("browser") {
|
|
|
+@@ -4004,10 +4000,6 @@ static_library("browser") {
|
|
|
"new_tab_page/modules/photos/photos_service.h",
|
|
|
"new_tab_page/modules/photos/photos_service_factory.cc",
|
|
|
"new_tab_page/modules/photos/photos_service_factory.h",
|
|
|
@@ -31,7 +31,7 @@
|
|
|
"new_tab_page/modules/task_module/task_module_handler.cc",
|
|
|
"new_tab_page/modules/task_module/task_module_handler.h",
|
|
|
"new_tab_page/modules/task_module/task_module_service.cc",
|
|
|
-@@ -7201,9 +7193,14 @@ static_library("browser") {
|
|
|
+@@ -7238,9 +7230,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",
|
|
|
@@ -63,7 +63,7 @@
|
|
|
auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -4252,11 +4252,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
+@@ -4244,11 +4244,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
&throttles);
|
|
|
#endif
|
|
|
|
|
|
@@ -77,7 +77,7 @@
|
|
|
|
|
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
|
|
// of lacros-chrome is complete.
|
|
|
-@@ -5657,26 +5659,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
+@@ -5680,26 +5682,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
const std::vector<std::string>& allowlist_domains) {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
|
|
|
@@ -105,7 +105,7 @@
|
|
|
}
|
|
|
|
|
|
safe_browsing::RealTimeUrlLookupServiceBase*
|
|
|
-@@ -5697,11 +5680,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
+@@ -5720,11 +5703,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
GetForProfile(profile);
|
|
|
}
|
|
|
#endif
|
|
|
@@ -119,7 +119,7 @@
|
|
|
|
|
|
--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
|
|
|
-@@ -143,45 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
|
|
|
+@@ -144,45 +144,6 @@ void MaybeCreateSafeBrowsingForRenderer(
|
|
|
const std::vector<std::string>& allowlist_domains)>
|
|
|
get_checker_delegate,
|
|
|
mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
|
|
|
@@ -266,15 +266,15 @@
|
|
|
}
|
|
|
--- a/chrome/browser/download/download_stats.cc
|
|
|
+++ b/chrome/browser/download/download_stats.cc
|
|
|
-@@ -8,6 +8,7 @@
|
|
|
- #include "base/metrics/user_metrics.h"
|
|
|
+@@ -9,6 +9,7 @@
|
|
|
#include "base/notreached.h"
|
|
|
+ #include "build/build_config.h"
|
|
|
#include "components/profile_metrics/browser_profile_type.h"
|
|
|
+#include "components/safe_browsing/buildflags.h"
|
|
|
#include "components/safe_browsing/content/browser/download/download_stats.h"
|
|
|
|
|
|
void RecordDownloadCount(ChromeDownloadCountTypes type) {
|
|
|
-@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown
|
|
|
+@@ -28,8 +29,10 @@ void RecordDangerousDownloadWarningShown
|
|
|
bool has_user_gesture) {
|
|
|
base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type,
|
|
|
download::DOWNLOAD_DANGER_TYPE_MAX);
|
|
|
@@ -287,7 +287,7 @@
|
|
|
void RecordOpenedDangerousConfirmDialog(
|
|
|
--- a/chrome/browser/download/download_target_determiner.cc
|
|
|
+++ b/chrome/browser/download/download_target_determiner.cc
|
|
|
-@@ -872,11 +872,13 @@ void DownloadTargetDeterminer::CheckVisi
|
|
|
+@@ -873,11 +873,13 @@ void DownloadTargetDeterminer::CheckVisi
|
|
|
bool visited_referrer_before) {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
|
|
|
@@ -301,7 +301,7 @@
|
|
|
danger_level_ = GetDangerLevel(
|
|
|
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
|
|
|
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
|
|
|
-@@ -1111,6 +1113,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
+@@ -1112,6 +1114,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
|
|
|
absl::optional<base::Time>
|
|
|
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
|
|
@@ -309,7 +309,7 @@
|
|
|
safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
|
|
|
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
|
|
|
GetProfile());
|
|
|
-@@ -1119,6 +1122,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
+@@ -1120,6 +1123,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
safe_browsing::SafeBrowsingMetricsCollector::
|
|
|
EventType::DANGEROUS_DOWNLOAD_BYPASS)
|
|
|
: absl::nullopt;
|
|
|
@@ -321,17 +321,17 @@
|
|
|
void DownloadTargetDeterminer::OnDownloadDestroyed(
|
|
|
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
|
|
-@@ -32,7 +32,6 @@
|
|
|
+@@ -33,7 +33,6 @@
|
|
|
#include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h"
|
|
|
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
|
|
|
#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
|
|
|
-#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
|
|
|
#include "chrome/grit/generated_resources.h"
|
|
|
#include "components/enterprise/common/proto/connectors.pb.h"
|
|
|
- #include "components/policy/core/browser/url_util.h"
|
|
|
+ #include "components/policy/core/common/chrome_schema.h"
|
|
|
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
-@@ -459,19 +459,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
+@@ -460,19 +460,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
return absl::nullopt;
|
|
|
}
|
|
|
|
|
|
@@ -353,7 +353,7 @@
|
|
|
}
|
|
|
--- a/chrome/browser/enterprise/connectors/connectors_service.h
|
|
|
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
|
|
|
-@@ -79,12 +79,6 @@ class ConnectorsService : public KeyedSe
|
|
|
+@@ -80,12 +80,6 @@ class ConnectorsService : public KeyedSe
|
|
|
// is no token to use.
|
|
|
absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
|
|
|
|
|
|
@@ -396,7 +396,7 @@
|
|
|
LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time);
|
|
|
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
|
|
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
|
|
-@@ -199,7 +199,6 @@ void ContextInfoFetcher::Fetch(ContextIn
|
|
|
+@@ -204,7 +204,6 @@ void ContextInfoFetcher::Fetch(ContextIn
|
|
|
GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED);
|
|
|
info.on_bulk_data_entry_providers =
|
|
|
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
|
|
|
@@ -404,7 +404,7 @@
|
|
|
info.on_security_event_providers = GetOnSecurityEventProviders();
|
|
|
info.browser_version = version_info::GetVersionNumber();
|
|
|
info.site_isolation_enabled =
|
|
|
-@@ -257,11 +256,6 @@ std::vector<std::string> ContextInfoFetc
|
|
|
+@@ -262,11 +261,6 @@ std::vector<std::string> ContextInfoFetc
|
|
|
return connectors_service_->GetAnalysisServiceProviderNames(connector);
|
|
|
}
|
|
|
|
|
|
@@ -468,7 +468,7 @@
|
|
|
-
|
|
|
absl::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) {
|
|
|
DCHECK(local_state);
|
|
|
- #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
+ #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
@@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
|
|
|
return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
|
|
|
}
|
|
|
@@ -484,7 +484,7 @@
|
|
|
-
|
|
|
absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state) {
|
|
|
DCHECK(local_state);
|
|
|
- #if defined(OS_WIN)
|
|
|
+ #if BUILDFLAG(IS_WIN)
|
|
|
--- a/chrome/browser/enterprise/signals/signals_utils.h
|
|
|
+++ b/chrome/browser/enterprise/signals/signals_utils.h
|
|
|
@@ -21,12 +21,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
|
|
|
@@ -502,7 +502,7 @@
|
|
|
} // namespace utils
|
|
|
--- a/chrome/browser/extensions/BUILD.gn
|
|
|
+++ b/chrome/browser/extensions/BUILD.gn
|
|
|
-@@ -642,8 +642,6 @@ static_library("extensions") {
|
|
|
+@@ -633,8 +633,6 @@ static_library("extensions") {
|
|
|
"menu_manager_factory.h",
|
|
|
"navigation_observer.cc",
|
|
|
"navigation_observer.h",
|
|
|
@@ -533,7 +533,7 @@
|
|
|
|
|
|
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
|
|
|
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
|
|
|
-@@ -340,6 +340,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -342,6 +342,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
event_router_->BroadcastEvent(std::move(extension_event));
|
|
|
}
|
|
|
|
|
|
@@ -541,7 +541,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -370,6 +371,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -372,6 +373,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
|
|
|
ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -549,7 +549,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
|
|
|
-@@ -397,6 +399,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -399,6 +401,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
event_router_->BroadcastEvent(std::move(extension_event));
|
|
|
}
|
|
|
|
|
|
@@ -557,7 +557,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -420,6 +423,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -422,6 +425,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
|
|
|
ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -565,7 +565,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
|
|
|
-@@ -447,6 +451,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -449,6 +453,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
event_router_->BroadcastEvent(std::move(extension_event));
|
|
|
}
|
|
|
|
|
|
@@ -573,7 +573,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -466,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -468,6 +473,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
|
|
|
ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -581,7 +581,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult(
|
|
|
-@@ -479,6 +485,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+@@ -481,6 +487,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
const enterprise_connectors::ContentAnalysisResponse::Result& result,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
|
@@ -589,7 +589,7 @@
|
|
|
if (result.tag() == "malware") {
|
|
|
DCHECK_EQ(1, result.triggered_rules().size());
|
|
|
OnDangerousDeepScanningResult(
|
|
|
-@@ -490,6 +497,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+@@ -492,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
|
|
|
trigger, scan_id, result, content_size, event_result);
|
|
|
}
|
|
|
@@ -597,7 +597,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
|
|
|
-@@ -505,6 +513,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -507,6 +515,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
const std::string& malware_category,
|
|
|
const std::string& evidence_locker_filepath,
|
|
|
const std::string& scan_id) {
|
|
|
@@ -605,7 +605,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -542,6 +551,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -544,6 +553,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
|
|
|
ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -613,7 +613,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
|
|
|
-@@ -554,6 +564,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -556,6 +566,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
const enterprise_connectors::ContentAnalysisResponse::Result& result,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
|
@@ -621,7 +621,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -586,6 +597,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -588,6 +599,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
|
|
|
ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -629,15 +629,15 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
|
|
|
-@@ -598,6 +610,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
- safe_browsing::DeepScanAccessPoint access_point,
|
|
|
+@@ -601,6 +613,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
const enterprise_connectors::ContentAnalysisResponse::Result& result,
|
|
|
- const int64_t content_size) {
|
|
|
+ const int64_t content_size,
|
|
|
+ absl::optional<std::u16string> user_justification) {
|
|
|
+#if defined(FULL_SAFE_BROWSING)
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -630,6 +643,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+@@ -636,6 +649,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
|
|
|
ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -645,7 +645,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
|
|
|
-@@ -642,6 +656,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
+@@ -648,6 +662,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
const std::string& reason,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
|
@@ -653,7 +653,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -668,6 +683,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
+@@ -674,6 +689,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
|
|
|
ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -661,7 +661,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
|
|
|
-@@ -693,6 +709,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -699,6 +715,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
const std::string& scan_id,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
|
@@ -669,7 +669,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -723,6 +740,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -729,6 +746,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
|
|
|
ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -677,7 +677,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
|
|
|
-@@ -746,6 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -752,6 +770,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
const std::string& mime_type,
|
|
|
const std::string& scan_id,
|
|
|
const int64_t content_size) {
|
|
|
@@ -685,7 +685,7 @@
|
|
|
absl::optional<enterprise_connectors::ReportingSettings> settings =
|
|
|
GetReportingSettings();
|
|
|
if (!settings.has_value() ||
|
|
|
-@@ -776,6 +795,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -782,6 +801,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
|
|
|
ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
|
|
|
std::move(event));
|
|
|
@@ -693,7 +693,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnLoginEvent(
|
|
|
-@@ -1101,7 +1121,11 @@ void SafeBrowsingPrivateEventRouter::Rep
|
|
|
+@@ -1107,7 +1127,11 @@ void SafeBrowsingPrivateEventRouter::Rep
|
|
|
}
|
|
|
|
|
|
std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
|
|
|
@@ -707,7 +707,7 @@
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
-@@ -600,15 +600,6 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
+@@ -606,15 +606,6 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
content::BrowserContext* context,
|
|
|
const ExtensionId& extension_id,
|
|
|
const std::string& code) const {
|
|
|
@@ -725,7 +725,7 @@
|
|
|
// static
|
|
|
--- a/chrome/browser/extensions/extension_service.cc
|
|
|
+++ b/chrome/browser/extensions/extension_service.cc
|
|
|
-@@ -52,7 +52,6 @@
|
|
|
+@@ -51,7 +51,6 @@
|
|
|
#include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
|
|
|
#include "chrome/browser/extensions/install_verifier.h"
|
|
|
#include "chrome/browser/extensions/installed_loader.h"
|
|
|
@@ -733,7 +733,7 @@
|
|
|
#include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
#include "chrome/browser/extensions/permissions_updater.h"
|
|
|
#include "chrome/browser/extensions/shared_module_service.h"
|
|
|
-@@ -206,7 +205,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
+@@ -202,7 +201,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
|
|
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
|
|
|
extension_prefs_);
|
|
|
@@ -741,7 +741,7 @@
|
|
|
}
|
|
|
|
|
|
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
|
|
|
-@@ -369,7 +367,6 @@ ExtensionService::ExtensionService(Profi
|
|
|
+@@ -365,7 +363,6 @@ ExtensionService::ExtensionService(Profi
|
|
|
safe_browsing_verdict_handler_(extension_prefs,
|
|
|
ExtensionRegistry::Get(profile),
|
|
|
this),
|
|
|
@@ -749,7 +749,7 @@
|
|
|
registry_(ExtensionRegistry::Get(profile)),
|
|
|
pending_extension_manager_(profile),
|
|
|
install_directory_(install_directory),
|
|
|
-@@ -857,100 +854,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
+@@ -861,100 +858,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
return extension_registrar_.IsExtensionEnabled(extension_id);
|
|
|
}
|
|
|
|
|
|
@@ -860,7 +860,7 @@
|
|
|
#include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
|
|
|
#include "chrome/browser/profiles/profile_manager.h"
|
|
|
-@@ -271,40 +270,11 @@ class ExtensionService : public Extensio
|
|
|
+@@ -275,40 +274,11 @@ class ExtensionService : public Extensio
|
|
|
// nothing.
|
|
|
void EnableExtension(const std::string& extension_id);
|
|
|
|
|
|
@@ -901,7 +901,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
|
|
|
-@@ -640,8 +610,6 @@ class ExtensionService : public Extensio
|
|
|
+@@ -648,8 +618,6 @@ class ExtensionService : public Extensio
|
|
|
|
|
|
SafeBrowsingVerdictHandler safe_browsing_verdict_handler_;
|
|
|
|
|
|
@@ -912,7 +912,7 @@
|
|
|
|
|
|
--- a/chrome/browser/extensions/extension_system_impl.cc
|
|
|
+++ b/chrome/browser/extensions/extension_system_impl.cc
|
|
|
-@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
+@@ -464,8 +464,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
|
|
|
const std::string& extension_id,
|
|
|
const base::Value& attributes) {
|
|
|
@@ -966,7 +966,7 @@
|
|
|
#include "chrome/browser/ui/file_system_access_dialogs.h"
|
|
|
#include "chrome/common/chrome_paths.h"
|
|
|
#include "components/content_settings/core/browser/host_content_settings_map.h"
|
|
|
-@@ -304,83 +302,6 @@ BindResultCallbackToCurrentSequence(
|
|
|
+@@ -305,83 +303,6 @@ BindResultCallbackToCurrentSequence(
|
|
|
base::SequencedTaskRunnerHandle::Get(), std::move(callback));
|
|
|
}
|
|
|
|
|
|
@@ -1050,7 +1050,7 @@
|
|
|
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
|
|
|
return id.empty() ? kDefaultLastPickedDirectoryKey
|
|
|
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
|
|
|
-@@ -1133,28 +1054,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
+@@ -1134,28 +1055,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
std::move(callback)));
|
|
|
}
|
|
|
|
|
|
@@ -1094,7 +1094,7 @@
|
|
|
|
|
|
--- 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"
|
|
|
@@ -1110,13 +1110,13 @@
|
|
|
// 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
|
|
|
-@@ -120,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
+@@ -121,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
observer->OnDesktopCaptureRequest();
|
|
|
return;
|
|
|
}
|
|
|
+ #endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
|
|
|
- #if defined(OS_MAC)
|
|
|
+ #if BUILDFLAG(IS_MAC)
|
|
|
// Do not allow picker UI to be shown on a page that isn't in the foreground
|
|
|
--- a/chrome/browser/notifications/notification_display_service_impl.cc
|
|
|
+++ b/chrome/browser/notifications/notification_display_service_impl.cc
|
|
|
@@ -1124,8 +1124,8 @@
|
|
|
profile_));
|
|
|
#endif
|
|
|
|
|
|
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
|
|
-- defined(OS_WIN)
|
|
|
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
|
|
+- BUILDFLAG(IS_WIN)
|
|
|
- AddNotificationHandler(
|
|
|
- NotificationHandler::Type::TAILORED_SECURITY,
|
|
|
- std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
|
|
|
@@ -1144,7 +1144,7 @@
|
|
|
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
|
|
|
#include "chrome/browser/signin/identity_manager_factory.h"
|
|
|
#include "chrome/browser/sync/sync_service_factory.h"
|
|
|
-@@ -112,11 +111,11 @@
|
|
|
+@@ -114,11 +113,11 @@
|
|
|
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
#include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
|
|
|
#include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
|
|
|
@@ -1155,9 +1155,9 @@
|
|
|
#include "ui/events/keycodes/keyboard_codes.h"
|
|
|
-#endif
|
|
|
|
|
|
- #if defined(OS_ANDROID)
|
|
|
+ #if BUILDFLAG(IS_ANDROID)
|
|
|
#include "chrome/browser/android/tab_android.h"
|
|
|
-@@ -830,6 +829,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
+@@ -837,6 +836,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
return autofill::LanguageCode();
|
|
|
}
|
|
|
|
|
|
@@ -1165,32 +1165,9 @@
|
|
|
safe_browsing::PasswordProtectionService*
|
|
|
ChromePasswordManagerClient::GetPasswordProtectionService() const {
|
|
|
return safe_browsing::ChromePasswordProtectionService::
|
|
|
-@@ -840,13 +840,6 @@ ChromePasswordManagerClient::GetPassword
|
|
|
- void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
|
|
|
- const GURL& form_action,
|
|
|
- const GURL& frame_url) {
|
|
|
-- safe_browsing::PasswordProtectionService* pps =
|
|
|
-- GetPasswordProtectionService();
|
|
|
-- if (pps) {
|
|
|
-- pps->MaybeStartPasswordFieldOnFocusRequest(
|
|
|
-- web_contents(), web_contents()->GetLastCommittedURL(), form_action,
|
|
|
-- frame_url, pps->GetAccountInfo().hosted_domain);
|
|
|
-- }
|
|
|
- }
|
|
|
- #endif // defined(ON_FOCUS_PING_ENABLED)
|
|
|
-
|
|
|
-@@ -856,22 +849,10 @@ void ChromePasswordManagerClient::CheckP
|
|
|
- const std::vector<password_manager::MatchingReusedCredential>&
|
|
|
- matching_reused_credentials,
|
|
|
- bool password_field_exists) {
|
|
|
-- safe_browsing::PasswordProtectionService* pps =
|
|
|
-- GetPasswordProtectionService();
|
|
|
-- if (!pps)
|
|
|
-- return;
|
|
|
--
|
|
|
-- pps->MaybeStartProtectedPasswordEntryRequest(
|
|
|
-- web_contents(), web_contents()->GetLastCommittedURL(), username,
|
|
|
-- password_type, matching_reused_credentials, password_field_exists);
|
|
|
+@@ -872,13 +872,9 @@ void ChromePasswordManagerClient::CheckP
|
|
|
+ web_contents(), web_contents()->GetLastCommittedURL(), username,
|
|
|
+ password_type, matching_reused_credentials, password_field_exists);
|
|
|
}
|
|
|
+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
|
|
|
@@ -1202,8 +1179,8 @@
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
- #if !defined(OS_ANDROID)
|
|
|
-@@ -1390,9 +1371,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
+ #if !BUILDFLAG(IS_ANDROID)
|
|
|
+@@ -1387,9 +1383,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
}
|
|
|
|
|
|
was_on_paste_called_ = true;
|
|
|
@@ -1212,11 +1189,11 @@
|
|
|
+#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
|
|
|
}
|
|
|
-#endif
|
|
|
-+#endif // !defined(OS_ANDROID)
|
|
|
++#endif // !BUILDFLAG(IS_ANDROID)
|
|
|
|
|
|
void ChromePasswordManagerClient::RenderFrameCreated(
|
|
|
content::RenderFrameHost* render_frame_host) {
|
|
|
-@@ -1427,7 +1410,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
+@@ -1424,7 +1422,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
|
|
|
OnPaste();
|
|
|
} else {
|
|
|
@@ -1224,9 +1201,9 @@
|
|
|
password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
|
|
|
+#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
|
|
|
}
|
|
|
- #endif // defined(OS_ANDROID)
|
|
|
+ #endif // BUILDFLAG(IS_ANDROID)
|
|
|
}
|
|
|
-@@ -1466,6 +1451,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1463,6 +1463,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
is_enabled = false;
|
|
|
}
|
|
|
|
|
|
@@ -1234,7 +1211,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
|
|
|
-@@ -1476,6 +1462,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1473,6 +1474,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
observer->OnPasswordSaveOrAutofillDenied();
|
|
|
is_enabled = false;
|
|
|
}
|
|
|
@@ -1244,7 +1221,7 @@
|
|
|
password_manager::BrowserSavePasswordProgressLogger logger(
|
|
|
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
|
|
|
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
|
|
|
-@@ -204,13 +204,14 @@ class ChromePasswordManagerClient
|
|
|
+@@ -206,13 +206,14 @@ class ChromePasswordManagerClient
|
|
|
void AnnotateNavigationEntry(bool has_password_field) override;
|
|
|
autofill::LanguageCode GetPageLanguage() const override;
|
|
|
|
|
|
@@ -1260,7 +1237,7 @@
|
|
|
|
|
|
void CheckProtectedPasswordEntry(
|
|
|
password_manager::metrics_util::PasswordType reused_password_type,
|
|
|
-@@ -218,6 +219,7 @@ class ChromePasswordManagerClient
|
|
|
+@@ -220,6 +221,7 @@ class ChromePasswordManagerClient
|
|
|
const std::vector<password_manager::MatchingReusedCredential>&
|
|
|
matching_reused_credentials,
|
|
|
bool password_field_exists) override;
|
|
|
@@ -1338,21 +1315,57 @@
|
|
|
void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
|
|
|
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
|
|
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
|
|
-@@ -212,10 +212,8 @@ bool PredictionBasedPermissionUiSelector
|
|
|
+@@ -306,47 +306,5 @@ bool PredictionBasedPermissionUiSelector
|
|
|
+
|
|
|
+ PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
|
|
|
permissions::RequestType request_type) {
|
|
|
- // We need to also check `kQuietNotificationPrompts` here since there is no
|
|
|
- // generic safeguard anywhere else in the stack.
|
|
|
-- if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
|
|
|
-- !safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
|
|
|
-+ if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts))
|
|
|
- return false;
|
|
|
+- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
|
|
|
+ return PredictionSource::USE_NONE;
|
|
|
+- }
|
|
|
+-
|
|
|
+- bool is_server_side_prediction_enabled = false;
|
|
|
+- bool is_ondevice_prediction_enabled = false;
|
|
|
+-
|
|
|
+- bool is_tflite_available = false;
|
|
|
+-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
|
|
|
+- is_tflite_available = true;
|
|
|
+-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
|
|
|
+-
|
|
|
+- // Notification supports both flavours of the quiet prompt
|
|
|
+- if (request_type == permissions::RequestType::kNotifications &&
|
|
|
+- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
|
|
|
+- base::FeatureList::IsEnabled(
|
|
|
+- permissions::features::kPermissionQuietChip))) {
|
|
|
+- is_server_side_prediction_enabled =
|
|
|
+- base::FeatureList::IsEnabled(features::kPermissionPredictions);
|
|
|
+-
|
|
|
+- is_ondevice_prediction_enabled =
|
|
|
+- is_tflite_available &&
|
|
|
+- base::FeatureList::IsEnabled(
|
|
|
+- permissions::features::kPermissionOnDeviceNotificationPredictions);
|
|
|
+- }
|
|
|
+-
|
|
|
+- // Geolocation supports only the quiet chip ui
|
|
|
+- if (request_type == permissions::RequestType::kGeolocation &&
|
|
|
+- base::FeatureList::IsEnabled(
|
|
|
+- permissions::features::kPermissionQuietChip)) {
|
|
|
+- is_server_side_prediction_enabled = base::FeatureList::IsEnabled(
|
|
|
+- features::kPermissionGeolocationPredictions);
|
|
|
- }
|
|
|
- double hold_back_chance = 0.0;
|
|
|
- bool is_permissions_predictions_enabled = false;
|
|
|
- switch (request_type) {
|
|
|
+-
|
|
|
+- if (is_server_side_prediction_enabled && is_ondevice_prediction_enabled) {
|
|
|
+- return PredictionSource::USE_ANY;
|
|
|
+- } else if (is_server_side_prediction_enabled) {
|
|
|
+- return PredictionSource::USE_SERVER_SIDE;
|
|
|
+- } else if (is_ondevice_prediction_enabled) {
|
|
|
+- return PredictionSource::USE_ONDEVICE;
|
|
|
+- } else {
|
|
|
+- return PredictionSource::USE_NONE;
|
|
|
+- }
|
|
|
+ }
|
|
|
--- a/chrome/browser/prefs/browser_prefs.cc
|
|
|
+++ b/chrome/browser/prefs/browser_prefs.cc
|
|
|
-@@ -241,7 +241,6 @@
|
|
|
+@@ -244,7 +244,6 @@
|
|
|
#include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
|
|
|
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
|
|
|
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
|
|
|
@@ -1360,7 +1373,7 @@
|
|
|
#include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
|
|
|
#include "chrome/browser/new_tab_page/promos/promo_service.h"
|
|
|
#include "chrome/browser/search/background/ntp_custom_background_service.h"
|
|
|
-@@ -1283,7 +1282,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -1348,7 +1347,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
NewTabPageHandler::RegisterProfilePrefs(registry);
|
|
|
NewTabPageUI::RegisterProfilePrefs(registry);
|
|
|
NewTabUI::RegisterProfilePrefs(registry);
|
|
|
@@ -1370,14 +1383,14 @@
|
|
|
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
|
|
|
-@@ -506,7 +506,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
+@@ -517,7 +517,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
SystemExtensionsProviderFactory::GetInstance();
|
|
|
#endif
|
|
|
TabRestoreServiceFactory::GetInstance();
|
|
|
- safe_browsing::TailoredSecurityServiceFactory::GetInstance();
|
|
|
TemplateURLFetcherFactory::GetInstance();
|
|
|
TemplateURLServiceFactory::GetInstance();
|
|
|
- #if !defined(OS_ANDROID)
|
|
|
+ #if !BUILDFLAG(IS_ANDROID)
|
|
|
--- a/chrome/browser/reputation/reputation_service.cc
|
|
|
+++ b/chrome/browser/reputation/reputation_service.cc
|
|
|
@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
|
|
|
@@ -1393,7 +1406,7 @@
|
|
|
if (service->EngagedSitesNeedUpdating()) {
|
|
|
--- a/chrome/browser/resources/settings/privacy_page/privacy_review/privacy_review_page.ts
|
|
|
+++ b/chrome/browser/resources/settings/privacy_page/privacy_review/privacy_review_page.ts
|
|
|
-@@ -16,7 +16,6 @@ import './privacy_review_completion_frag
|
|
|
+@@ -17,7 +17,6 @@ import './privacy_review_completion_frag
|
|
|
import './privacy_review_cookies_fragment.js';
|
|
|
import './privacy_review_history_sync_fragment.js';
|
|
|
import './privacy_review_msbb_fragment.js';
|
|
|
@@ -1453,7 +1466,7 @@
|
|
|
} // namespace safe_browsing
|
|
|
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
|
|
|
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
|
|
|
-@@ -142,15 +142,6 @@ CreateSettingsPageHelper() {
|
|
|
+@@ -143,15 +143,6 @@ CreateSettingsPageHelper() {
|
|
|
CreateChromeSettingsPageHelper();
|
|
|
}
|
|
|
|
|
|
@@ -1469,7 +1482,7 @@
|
|
|
} // namespace
|
|
|
|
|
|
std::unique_ptr<SSLBlockingPage>
|
|
|
-@@ -174,10 +165,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
+@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext()));
|
|
|
state->DidDisplayErrorPage(cert_error);
|
|
|
|
|
|
@@ -1480,7 +1493,7 @@
|
|
|
auto controller_client = std::make_unique<SSLErrorControllerClient>(
|
|
|
web_contents, ssl_info, cert_error, request_url,
|
|
|
std::move(metrics_helper), CreateSettingsPageHelper());
|
|
|
-@@ -247,10 +234,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
+@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
|
|
|
const net::SSLInfo& ssl_info,
|
|
|
const std::string& mitm_software_name) {
|
|
|
@@ -1491,7 +1504,7 @@
|
|
|
auto page = std::make_unique<MITMSoftwareBlockingPage>(
|
|
|
web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
|
|
|
/*can_show_enhanced_protection_message=*/true, ssl_info,
|
|
|
-@@ -272,10 +255,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
+@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::Creat
|
|
|
const GURL& request_url,
|
|
|
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
|
|
|
const net::SSLInfo& ssl_info) {
|
|
|
@@ -1545,7 +1558,7 @@
|
|
|
} // namespace
|
|
|
--- a/chrome/browser/ui/BUILD.gn
|
|
|
+++ b/chrome/browser/ui/BUILD.gn
|
|
|
-@@ -544,7 +544,6 @@ static_library("ui") {
|
|
|
+@@ -546,7 +546,6 @@ static_library("ui") {
|
|
|
"//components/renderer_context_menu",
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing/content/browser",
|
|
|
@@ -1553,7 +1566,7 @@
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
"//components/safe_browsing/core/browser/db:database_manager",
|
|
|
-@@ -4499,8 +4498,6 @@ static_library("ui") {
|
|
|
+@@ -4523,8 +4522,6 @@ static_library("ui") {
|
|
|
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
|
|
|
"views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
|
|
|
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
|
|
|
@@ -1688,7 +1701,7 @@
|
|
|
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
|
|
|
prompt_to_scan || allow_open_during_deep_scan);
|
|
|
|
|
|
-@@ -1428,7 +1430,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
+@@ -1433,7 +1435,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
}
|
|
|
|
|
|
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
|
|
|
@@ -1710,7 +1723,7 @@
|
|
|
|
|
|
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
-@@ -805,12 +805,6 @@ base::Value ManagementUIHandler::GetThre
|
|
|
+@@ -819,12 +819,6 @@ base::Value ManagementUIHandler::GetThre
|
|
|
&info);
|
|
|
}
|
|
|
|
|
|
@@ -1725,7 +1738,7 @@
|
|
|
|
|
|
--- a/chrome/browser/webshare/share_service_impl.cc
|
|
|
+++ b/chrome/browser/webshare/share_service_impl.cc
|
|
|
-@@ -15,7 +15,9 @@
|
|
|
+@@ -16,7 +16,9 @@
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
|
#include "chrome/common/chrome_features.h"
|
|
|
@@ -1735,7 +1748,7 @@
|
|
|
#include "components/safe_browsing/core/browser/db/database_manager.h"
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
|
|
|
-@@ -195,11 +197,13 @@ void ShareServiceImpl::Share(const std::
|
|
|
+@@ -196,11 +198,13 @@ void ShareServiceImpl::Share(const std::
|
|
|
// Check if at least one file is marked by the download protection service
|
|
|
// to send a ping to check this file type.
|
|
|
const base::FilePath path = base::FilePath::FromUTF8Unsafe(file->name);
|
|
|
@@ -1749,7 +1762,7 @@
|
|
|
|
|
|
// In the case where the original blob handle was to a native file (of
|
|
|
// unknown size), the serialized data does not contain an accurate file
|
|
|
-@@ -209,6 +213,7 @@ void ShareServiceImpl::Share(const std::
|
|
|
+@@ -210,6 +214,7 @@ void ShareServiceImpl::Share(const std::
|
|
|
}
|
|
|
|
|
|
DCHECK(!safe_browsing_request_);
|
|
|
@@ -1757,7 +1770,7 @@
|
|
|
if (should_check_url && g_browser_process->safe_browsing_service()) {
|
|
|
safe_browsing_request_.emplace(
|
|
|
g_browser_process->safe_browsing_service()->database_manager(),
|
|
|
-@@ -218,6 +223,7 @@ void ShareServiceImpl::Share(const std::
|
|
|
+@@ -219,6 +224,7 @@ void ShareServiceImpl::Share(const std::
|
|
|
std::move(files), std::move(callback)));
|
|
|
return;
|
|
|
}
|
|
|
@@ -1767,7 +1780,7 @@
|
|
|
std::move(callback),
|
|
|
--- a/chrome/test/BUILD.gn
|
|
|
+++ b/chrome/test/BUILD.gn
|
|
|
-@@ -1212,7 +1212,6 @@ if (!is_android && !is_fuchsia) {
|
|
|
+@@ -1251,7 +1251,6 @@ if (!is_android && !is_fuchsia) {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
|
@@ -1775,7 +1788,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",
|
|
|
-@@ -5348,7 +5347,6 @@ test("unit_tests") {
|
|
|
+@@ -5376,7 +5375,6 @@ test("unit_tests") {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
|
@@ -1796,7 +1809,7 @@
|
|
|
}
|
|
|
--- a/components/password_manager/core/browser/password_manager_client.h
|
|
|
+++ b/components/password_manager/core/browser/password_manager_client.h
|
|
|
-@@ -340,11 +340,14 @@ class PasswordManagerClient {
|
|
|
+@@ -344,11 +344,14 @@ class PasswordManagerClient {
|
|
|
// Returns the current best guess as to the page's display language.
|
|
|
virtual autofill::LanguageCode GetPageLanguage() const;
|
|
|
|
|
|
@@ -1812,7 +1825,7 @@
|
|
|
// Checks the safe browsing reputation of the webpage when the
|
|
|
// user focuses on a username/password field. This is used for reporting
|
|
|
// only, and won't trigger a warning.
|
|
|
-@@ -352,6 +355,7 @@ class PasswordManagerClient {
|
|
|
+@@ -356,6 +359,7 @@ class PasswordManagerClient {
|
|
|
const GURL& frame_url) = 0;
|
|
|
#endif
|
|
|
|
|
|
@@ -1820,7 +1833,7 @@
|
|
|
// Checks the safe browsing reputation of the webpage where password reuse
|
|
|
// happens. This is called by the PasswordReuseDetectionManager when a
|
|
|
// protected password is typed on the wrong domain. This may trigger a
|
|
|
-@@ -364,6 +368,7 @@ class PasswordManagerClient {
|
|
|
+@@ -368,6 +372,7 @@ class PasswordManagerClient {
|
|
|
const std::string& username,
|
|
|
const std::vector<MatchingReusedCredential>& matching_reused_credentials,
|
|
|
bool password_field_exists) = 0;
|
Blaise