|
@@ -131,7 +131,23 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -497,6 +504,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -434,6 +441,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+ OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
|
|
|
+ trigger, result, content_size, event_result);
|
|
|
+ }
|
|
|
++#endif // FULL_SAFE_BROWSING
|
|
|
+ }
|
|
|
+
|
|
|
+ void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
|
|
|
+@@ -448,6 +456,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+ const std::string& malware_family,
|
|
|
+ const std::string& malware_category,
|
|
|
+ const std::string& evidence_locker_filepath) {
|
|
|
++#if defined(FULL_SAFE_BROWSING)
|
|
|
+ if (!IsRealtimeReportingEnabled())
|
|
|
+ return;
|
|
|
+
|
|
|
+@@ -497,6 +506,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
|
|
|
threat_type, mime_type, trigger, content_size, event_result,
|
|
|
malware_family, malware_category, evidence_locker_filepath));
|
|
@@ -139,7 +155,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
|
|
|
-@@ -508,6 +516,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -508,6 +518,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
const enterprise_connectors::ContentAnalysisResponse::Result& result,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
@@ -147,7 +163,7 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -553,6 +562,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
+@@ -553,6 +564,7 @@ void SafeBrowsingPrivateEventRouter::OnS
|
|
|
result, url.spec(), file_name, download_digest_sha256,
|
|
|
GetProfileUserName(), mime_type, trigger, content_size,
|
|
|
event_result));
|
|
@@ -155,7 +171,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
|
|
|
-@@ -564,6 +574,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+@@ -564,6 +576,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
safe_browsing::DeepScanAccessPoint access_point,
|
|
|
const enterprise_connectors::ContentAnalysisResponse::Result& result,
|
|
|
const int64_t content_size) {
|
|
@@ -163,7 +179,7 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -608,6 +619,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
+@@ -608,6 +621,7 @@ void SafeBrowsingPrivateEventRouter::OnA
|
|
|
result, url.spec(), file_name, download_digest_sha256,
|
|
|
GetProfileUserName(), mime_type, trigger, access_point,
|
|
|
content_size));
|
|
@@ -171,7 +187,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
|
|
|
-@@ -620,6 +632,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
+@@ -620,6 +634,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
const std::string& reason,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
@@ -179,7 +195,7 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -659,6 +672,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
+@@ -659,6 +674,7 @@ void SafeBrowsingPrivateEventRouter::OnU
|
|
|
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
|
|
|
mime_type, trigger, access_point, reason, content_size,
|
|
|
event_result));
|
|
@@ -187,7 +203,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
|
|
|
-@@ -669,6 +683,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -669,6 +685,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
const std::string& mime_type,
|
|
|
const int64_t content_size,
|
|
|
safe_browsing::EventResult event_result) {
|
|
@@ -195,7 +211,7 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -703,6 +718,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -703,6 +720,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
},
|
|
|
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
|
|
|
threat_type, mime_type, content_size, event_result));
|
|
@@ -203,7 +219,7 @@
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
|
|
|
-@@ -712,6 +728,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -712,6 +730,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
const std::string& threat_type,
|
|
|
const std::string& mime_type,
|
|
|
const int64_t content_size) {
|
|
@@ -211,7 +227,7 @@
|
|
|
if (!IsRealtimeReportingEnabled())
|
|
|
return;
|
|
|
|
|
|
-@@ -745,6 +762,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
+@@ -745,6 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnD
|
|
|
},
|
|
|
url.spec(), file_name, download_digest_sha256, GetProfileUserName(),
|
|
|
threat_type, mime_type, content_size));
|
|
@@ -219,7 +235,7 @@
|
|
|
}
|
|
|
|
|
|
// static
|
|
|
-@@ -970,7 +988,11 @@ void SafeBrowsingPrivateEventRouter::Rep
|
|
|
+@@ -970,7 +990,11 @@ void SafeBrowsingPrivateEventRouter::Rep
|
|
|
}
|
|
|
|
|
|
std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
|
|
@@ -1049,7 +1065,7 @@
|
|
|
scoped_refptr<NativeFileSystemManagerImpl> manager,
|
|
|
--- a/content/public/browser/native_file_system_permission_context.h
|
|
|
+++ b/content/public/browser/native_file_system_permission_context.h
|
|
|
-@@ -99,12 +99,6 @@ class NativeFileSystemPermissionContext
|
|
|
+@@ -99,12 +99,6 @@ class NativeFileSystemPermissionContext
|
|
|
base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
|
|
|
|
|
|
enum class AfterWriteCheckResult { kAllow, kBlock };
|