110.0.5481.100 git apply

changes for 110.0.5481.100
This commit is contained in:
uazo
2023-02-15 01:14:58 -09:00
committed by GitHub
@@ -11,7 +11,7 @@ Subject: 109 ADDTO Disable safe browsing
diff --git 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
--- 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
@@ -115,6 +115,7 @@ const char kPathKey[] = "path";
@@ -117,6 +117,7 @@ const char kPathKey[] = "path";
const char kPathTypeKey[] = "path-type";
const char kTimestampKey[] = "timestamp";
@@ -19,7 +19,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin,
@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
@@ -146,7 +147,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
origin, handle_type, std::move(callback), web_contents);
}
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
void ShowFileSystemAccessDangerousFileDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin,
@@ -437,6 +437,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
@@ -488,6 +488,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
: kPermissionReadableKey;
}
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -448,6 +449,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
@@ -499,6 +500,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
}