75 lines
4.1 KiB
Diff
75 lines
4.1 KiB
Diff
From: Your Name <you@example.com>
|
|
Date: Thu, 5 Jan 2023 11:34:41 +0000
|
|
Subject: Disable safe browsing (add fixup)
|
|
|
|
---
|
|
.../chrome_file_system_access_permission_context.cc | 4 +++-
|
|
chrome/browser/ui/android/strings/android_chrome_strings.grd | 3 +++
|
|
chrome/browser/ui/webui/interstitials/interstitial_ui.cc | 4 ----
|
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
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";
|
|
const char kPathTypeKey[] = "path-type";
|
|
const char kTimestampKey[] = "timestamp";
|
|
|
|
+#if defined(FULL_SAFE_BROWSING)
|
|
void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
|
|
content::GlobalRenderFrameHostId frame_id,
|
|
const url::Origin& origin,
|
|
@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
|
|
origin, handle_type, std::move(callback), web_contents);
|
|
}
|
|
|
|
-#if defined(FULL_SAFE_BROWSING)
|
|
void ShowFileSystemAccessDangerousFileDialogOnUIThread(
|
|
content::GlobalRenderFrameHostId frame_id,
|
|
const url::Origin& origin,
|
|
@@ -431,6 +431,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
|
|
: kPermissionReadableKey;
|
|
}
|
|
|
|
+#if defined(FULL_SAFE_BROWSING)
|
|
bool FileHasDangerousExtension(const url::Origin& origin,
|
|
const base::FilePath& path,
|
|
Profile* profile) {
|
|
@@ -442,6 +443,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
|
|
return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
|
|
danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
|
|
}
|
|
+#endif
|
|
|
|
} // namespace
|
|
|
|
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
@@ -467,6 +467,9 @@ CHAR_LIMIT guidelines:
|
|
<message name="IDS_PRELOAD_PAGES_EXTENDED_PRELOADING_BULLET_FOUR" desc="Fourth bullet point under the Preload Pages extended preloading mode. Informs the user about what the extended preloading setting does.">
|
|
Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account.
|
|
</message>
|
|
+ <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
|
|
+ Help improve Chrome\u2019s features and performance
|
|
+ </message>
|
|
|
|
<!-- Metrics settings -->
|
|
<message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
|
|
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
|
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
|
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
|
@@ -518,10 +518,6 @@ void InterstitialHTMLSource::StartDataRequest(
|
|
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
|
|
} else if (path_without_query == "/blocked-interception") {
|
|
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
|
|
- } else if (path_without_query == "/enterprise-block") {
|
|
- interstitial_delegate = CreateEnterpriseBlockPage(web_contents);
|
|
- } else if (path_without_query == "/enterprise-warn") {
|
|
- interstitial_delegate = CreateEnterpriseWarnPage(web_contents);
|
|
} else if (path_without_query == "/clock") {
|
|
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
|
|
} else if (path_without_query == "/lookalike") {
|
|
--
|
|
2.25.1
|