145 lines
8.7 KiB
Diff
145 lines
8.7 KiB
Diff
|
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||
|
|
Date: Sun, 6 Mar 2022 17:39:15 +0100
|
||
|
|
Subject: Disable safety check
|
||
|
|
|
||
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
|
|
---
|
||
|
|
chrome/android/BUILD.gn | 5 -----
|
||
|
|
chrome/android/chrome_java_sources.gni | 1 -
|
||
|
|
chrome/android/java/res/xml/main_preferences.xml | 5 -----
|
||
|
|
.../chrome/browser/settings/SettingsActivity.java | 9 ---------
|
||
|
|
.../chrome/browser/settings/SettingsLauncherImpl.java | 5 +----
|
||
|
|
chrome/browser/BUILD.gn | 1 -
|
||
|
|
.../browser/omnibox/suggestions/action/OmniboxPedal.java | 3 ---
|
||
|
|
7 files changed, 1 insertion(+), 28 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||
|
|
--- a/chrome/android/BUILD.gn
|
||
|
|
+++ b/chrome/android/BUILD.gn
|
||
|
|
@@ -397,7 +397,6 @@ if (current_toolchain == default_toolchain) {
|
||
|
|
"//chrome/browser/recent_tabs:helper_java",
|
||
|
|
"//chrome/browser/recent_tabs:java",
|
||
|
|
"//chrome/browser/safe_browsing/android:java",
|
||
|
|
- "//chrome/browser/safety_check/android:java",
|
||
|
|
"//chrome/browser/screenshot_monitor:java",
|
||
|
|
"//chrome/browser/search_engines/android:java",
|
||
|
|
"//chrome/browser/search_resumption:java",
|
||
|
|
@@ -1032,8 +1031,6 @@ if (current_toolchain == default_toolchain) {
|
||
|
|
"//chrome/browser/recent_tabs:java",
|
||
|
|
"//chrome/browser/recent_tabs:junit",
|
||
|
|
"//chrome/browser/recent_tabs/internal:junit",
|
||
|
|
- "//chrome/browser/safety_check/android:java",
|
||
|
|
- "//chrome/browser/safety_check/android:junit",
|
||
|
|
"//chrome/browser/screenshot_monitor:java",
|
||
|
|
"//chrome/browser/search_engines/android:java",
|
||
|
|
"//chrome/browser/search_engines/android:junit",
|
||
|
|
@@ -1637,8 +1634,6 @@ if (current_toolchain == default_toolchain) {
|
||
|
|
"//chrome/browser/quick_delete:javatests",
|
||
|
|
"//chrome/browser/safe_browsing/android:java",
|
||
|
|
"//chrome/browser/safe_browsing/android:javatests",
|
||
|
|
- "//chrome/browser/safety_check/android:java",
|
||
|
|
- "//chrome/browser/safety_check/android:javatests",
|
||
|
|
"//chrome/browser/screenshot_monitor:java",
|
||
|
|
"//chrome/browser/search_engines/android:java",
|
||
|
|
"//chrome/browser/segmentation_platform:javatests",
|
||
|
|
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||
|
|
--- a/chrome/android/chrome_java_sources.gni
|
||
|
|
+++ b/chrome/android/chrome_java_sources.gni
|
||
|
|
@@ -1000,7 +1000,6 @@ chrome_java_sources = [
|
||
|
|
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
|
||
|
|
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
|
||
|
|
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
|
||
|
|
- "java/src/org/chromium/chrome/browser/safety_check/SafetyCheckUpdatesDelegateImpl.java",
|
||
|
|
"java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java",
|
||
|
|
"java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",
|
||
|
|
"java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",
|
||
|
|
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
|
||
|
|
--- a/chrome/android/java/res/xml/main_preferences.xml
|
||
|
|
+++ b/chrome/android/java/res/xml/main_preferences.xml
|
||
|
|
@@ -61,11 +61,6 @@
|
||
|
|
android:key="privacy"
|
||
|
|
android:order="11"
|
||
|
|
android:title="@string/prefs_privacy_security"/>
|
||
|
|
- <Preference
|
||
|
|
- android:fragment="org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment"
|
||
|
|
- android:key="safety_check"
|
||
|
|
- android:order="12"
|
||
|
|
- android:title="@string/prefs_safety_check"/>
|
||
|
|
<Preference
|
||
|
|
android:fragment="org.chromium.components.adblock.settings.AdblockSettingsFragment"
|
||
|
|
android:key="eyeo_adblock"
|
||
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||
|
|
@@ -67,9 +67,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsBaseFra
|
||
|
|
import org.chromium.chrome.browser.profiles.Profile;
|
||
|
|
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
|
||
|
|
import org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragmentBase;
|
||
|
|
-import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator;
|
||
|
|
-import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
|
||
|
|
-import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl;
|
||
|
|
import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
|
||
|
|
import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
|
||
|
|
import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
|
||
|
|
@@ -500,12 +497,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
|
||
|
|
((BaseSiteSettingsFragment) fragment)
|
||
|
|
.setSiteSettingsDelegate(new ChromeSiteSettingsDelegate(this, mProfile));
|
||
|
|
}
|
||
|
|
- if (fragment instanceof SafetyCheckSettingsFragment) {
|
||
|
|
- SafetyCheckCoordinator.create((SafetyCheckSettingsFragment) fragment,
|
||
|
|
- new SafetyCheckUpdatesDelegateImpl(), mSettingsLauncher,
|
||
|
|
- SyncConsentActivityLauncherImpl.get(), getModalDialogManagerSupplier(),
|
||
|
|
- SyncServiceFactory.getForProfile(mProfile));
|
||
|
|
- }
|
||
|
|
if (fragment instanceof PasswordCheckFragmentView) {
|
||
|
|
PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment,
|
||
|
|
HelpAndFeedbackLauncherImpl.getForProfile(mProfile), mSettingsLauncher,
|
||
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java
|
||
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java
|
||
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java
|
||
|
|
@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.autofill.settings.AutofillPaymentMethodsFragm
|
||
|
|
import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment;
|
||
|
|
import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAdvanced;
|
||
|
|
import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment;
|
||
|
|
-import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
|
||
|
|
import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
|
||
|
|
import org.chromium.components.browser_ui.settings.SettingsLauncher;
|
||
|
|
import org.chromium.components.browser_ui.site_settings.SiteSettings;
|
||
|
|
@@ -57,9 +56,7 @@ public class SettingsLauncherImpl implements SettingsLauncher {
|
||
|
|
break;
|
||
|
|
|
||
|
|
case SettingsFragment.SAFETY_CHECK:
|
||
|
|
- fragment = SafetyCheckSettingsFragment.class;
|
||
|
|
- fragmentArgs = SafetyCheckSettingsFragment.createBundle(true);
|
||
|
|
- break;
|
||
|
|
+ return;
|
||
|
|
|
||
|
|
case SettingsFragment.SITE:
|
||
|
|
fragment = SiteSettings.class;
|
||
|
|
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||
|
|
--- a/chrome/browser/BUILD.gn
|
||
|
|
+++ b/chrome/browser/BUILD.gn
|
||
|
|
@@ -3513,7 +3513,6 @@ static_library("browser") {
|
||
|
|
"//chrome/browser/reading_list/android",
|
||
|
|
"//chrome/browser/recent_tabs:jni_headers",
|
||
|
|
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
|
||
|
|
- "//chrome/browser/safety_check/android",
|
||
|
|
"//chrome/browser/search_resumption:jni_headers",
|
||
|
|
"//chrome/browser/share/core/crow:crow_configuration",
|
||
|
|
"//chrome/browser/signin/services/android:jni_headers",
|
||
|
|
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/action/OmniboxPedal.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/action/OmniboxPedal.java
|
||
|
|
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/action/OmniboxPedal.java
|
||
|
|
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/action/OmniboxPedal.java
|
||
|
|
@@ -44,9 +44,6 @@ public class OmniboxPedal extends OmniboxAction {
|
||
|
|
case OmniboxPedalId.UPDATE_CREDIT_CARD:
|
||
|
|
delegate.openSettingsPage(SettingsFragment.PAYMENT_METHODS);
|
||
|
|
break;
|
||
|
|
- case OmniboxPedalId.RUN_CHROME_SAFETY_CHECK:
|
||
|
|
- delegate.openSettingsPage(SettingsFragment.SAFETY_CHECK);
|
||
|
|
- break;
|
||
|
|
case OmniboxPedalId.MANAGE_SITE_SETTINGS:
|
||
|
|
delegate.openSettingsPage(SettingsFragment.SITE);
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.25.1
|