PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

merge code from disable safe browsing

Browse Source
This commit is contained in:
Carmelo Messina
2023-05-07 17:33:01 +02:00
parent 41d8cdfe2d
commit 98b4646953
5 changed files with 244 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Disable-safety-check.patch
+32 -6
View File
@@ -7,13 +7,14 @@ 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 -
.../browser/app/omnibox/ActionChipsDelegateImpl.java | 8 --------
.../chrome/browser/settings/SettingsActivity.java | 8 --------
chrome/browser/BUILD.gn | 1 -
4 files changed, 15 deletions(-)
5 files changed, 23 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -314,7 +314,6 @@ if (current_toolchain == default_toolchain) {
@@ -323,7 +323,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/recent_tabs:factory_java",
"//chrome/browser/recent_tabs:java",
"//chrome/browser/safe_browsing/android:java",
@@ -21,7 +22,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:java",
"//chrome/browser/segmentation_platform:factory_java",
@@ -897,8 +896,6 @@ if (current_toolchain == default_toolchain) {
@@ -926,8 +925,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/quick_delete:junit",
"//chrome/browser/recent_tabs:java",
"//chrome/browser/recent_tabs/internal:junit",
@@ -30,7 +31,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:junit",
"//chrome/browser/segmentation_platform:factory_java",
@@ -1440,8 +1437,6 @@ if (current_toolchain == default_toolchain) {
@@ -1484,8 +1481,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/quick_delete:javatests",
"//chrome/browser/safe_browsing/android:java",
"//chrome/browser/safe_browsing/android:javatests",
@@ -42,7 +43,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
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
@@ -927,7 +927,6 @@ chrome_java_sources = [
@@ -980,7 +980,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",
@@ -82,10 +83,35 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Act
case OmniboxPedalType.MANAGE_SITE_SETTINGS:
case OmniboxPedalType.MANAGE_CHROME_SETTINGS:
case OmniboxPedalType.VIEW_CHROME_HISTORY:
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
@@ -60,9 +60,6 @@ import org.chromium.chrome.browser.privacy_sandbox.AdMeasurementFragment;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsBaseFragment;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
-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;
@@ -439,11 +436,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
fragmentHelpAndFeedbackLauncher.setHelpAndFeedbackLauncher(
HelpAndFeedbackLauncherImpl.getForProfile(mProfile));
}
- if (fragment instanceof SafetyCheckSettingsFragment) {
- SafetyCheckCoordinator.create((SafetyCheckSettingsFragment) fragment,
- new SafetyCheckUpdatesDelegateImpl(), mSettingsLauncher,
- SyncConsentActivityLauncherImpl.get(), getModalDialogManagerSupplier());
- }
if (fragment instanceof PasswordCheckFragmentView) {
PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment,
HelpAndFeedbackLauncherImpl.getForProfile(mProfile), mSettingsLauncher,
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3261,7 +3261,6 @@ static_library("browser") {
@@ -3308,7 +3308,6 @@ static_library("browser") {
"//chrome/browser/reading_list/android",
"//chrome/browser/recent_tabs:jni_headers",
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
build/patches/Disable-support-for-RAR-files-inspection.patch
+40 -2
View File
@@ -6,9 +6,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../download_protection/file_analyzer.cc | 2 +-
chrome/common/safe_browsing/BUILD.gn | 2 --
chrome/common/safe_browsing/zip_analyzer.cc | 7 -------
chrome/common/safe_browsing/zip_analyzer.h | 2 --
.../services/file_util/safe_archive_analyzer.cc | 17 +++--------------
.../services/file_util/safe_archive_analyzer.h | 2 --
4 files changed, 4 insertions(+), 19 deletions(-)
6 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -25,7 +27,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b
diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
@@ -137,8 +137,6 @@ source_set("safe_browsing") {
@@ -143,8 +143,6 @@ source_set("safe_browsing") {
"protobuf_message_log_macros.h",
"protobuf_message_read_macros.h",
"protobuf_message_write_macros.h",
@@ -34,6 +36,42 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
"seven_zip_analyzer.cc",
"seven_zip_analyzer.h",
"zip_analyzer.cc",
diff --git a/chrome/common/safe_browsing/zip_analyzer.cc b/chrome/common/safe_browsing/zip_analyzer.cc
--- a/chrome/common/safe_browsing/zip_analyzer.cc
+++ b/chrome/common/safe_browsing/zip_analyzer.cc
@@ -132,13 +132,6 @@ bool ZipAnalyzer::AnalyzeNestedArchive(
std::move(nested_analysis_finished_callback),
get_temp_file_callback_, results_);
return true;
- } else if (file_type == DownloadFileType::RAR) {
- nested_rar_analyzer_ = std::make_unique<safe_browsing::RarAnalyzer>();
- nested_rar_analyzer_->Init(temp_file_.Duplicate(),
- root_zip_path_.Append(path),
- std::move(nested_analysis_finished_callback),
- get_temp_file_callback_, results_);
- return true;
}
return false;
}
diff --git a/chrome/common/safe_browsing/zip_analyzer.h b/chrome/common/safe_browsing/zip_analyzer.h
--- a/chrome/common/safe_browsing/zip_analyzer.h
+++ b/chrome/common/safe_browsing/zip_analyzer.h
@@ -14,7 +14,6 @@
#include "third_party/zlib/google/zip_reader.h"
namespace safe_browsing {
-class RarAnalyzer;
struct ArchiveAnalyzerResults;
using FinishedAnalysisCallback = base::OnceCallback<void()>;
@@ -78,7 +77,6 @@ class ZipAnalyzer {
// DFS.
// TODO(crbug.com/1426164) Create a common class to hold all analyzers.
std::unique_ptr<safe_browsing::ZipAnalyzer> nested_zip_analyzer_;
- std::unique_ptr<safe_browsing::RarAnalyzer> nested_rar_analyzer_;
base::WeakPtrFactory<ZipAnalyzer> weak_factory_{this};
};
diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
--- a/chrome/services/file_util/safe_archive_analyzer.cc
+++ b/chrome/services/file_util/safe_archive_analyzer.cc
build/patches/Remove-binary-blob-integrations.patch
+83 -68
View File
@@ -29,8 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/android/chrome_java_sources.gni | 5 -
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 51 --
.../java/res/xml/privacy_preferences.xml | 5 -
.../org/chromium/chrome/browser/AppHooks.java | 12 +-
.../org/chromium/chrome/browser/AppHooks.java | 9 +-
.../browser/ChromeBackgroundService.java | 12 +-
.../browser/PlayServicesVersionInfo.java | 11 +-
.../ChromeBackgroundTaskFactory.java | 3 -
@@ -46,9 +45,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../language/settings/LanguageSettings.java | 6 -
.../prefetch/prefetch_service_factory.cc | 16 -
.../browser/password_manager/android/BUILD.gn | 4 -
.../PasswordManagerAndroidBackendUtil.java | 43 +-
.../PasswordManagerAndroidBackendUtil.java | 40 +-
.../PasswordManagerHelper.java | 20 +-
...swordSyncControllerDelegateBridgeImpl.java | 7 -
chrome/browser/privacy/BUILD.gn | 1 +
.../push_messaging_service_factory.cc | 8 +-
chrome/browser/resources/settings/route.ts | 2 -
chrome/browser/ui/BUILD.gn | 3 -
@@ -105,7 +104,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
weblayer/browser/java/BUILD.gn | 1 -
81 files changed, 96 insertions(+), 1961 deletions(-)
80 files changed, 97 insertions(+), 1968 deletions(-)
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -132,7 +131,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -230,14 +230,6 @@ if (current_toolchain == default_toolchain) {
@@ -231,14 +231,6 @@ if (current_toolchain == default_toolchain) {
":chrome_public_apk_template_resources",
":update_proto_java",
":usage_stats_proto_java",
@@ -147,7 +146,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:jni_java",
"//cc:cc_java",
"//cc/mojom:mojom_java",
@@ -531,14 +523,23 @@ if (current_toolchain == default_toolchain) {
@@ -534,14 +526,23 @@ if (current_toolchain == default_toolchain) {
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
@@ -174,7 +173,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_media:android_media_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -819,11 +820,6 @@ if (current_toolchain == default_toolchain) {
@@ -823,11 +824,6 @@ if (current_toolchain == default_toolchain) {
":chrome_java",
":chrome_jni_headers",
":delegate_public_impl_java",
@@ -186,7 +185,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
@@ -1377,13 +1373,6 @@ if (current_toolchain == default_toolchain) {
@@ -1387,13 +1383,6 @@ if (current_toolchain == default_toolchain) {
":chrome_app_java_resources",
":chrome_test_util_java",
":delegate_public_impl_java",
@@ -200,7 +199,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2312,7 +2301,6 @@ if (current_toolchain == default_toolchain) {
@@ -2327,7 +2316,6 @@ if (current_toolchain == default_toolchain) {
]
deps = [
":chrome_java",
@@ -208,7 +207,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2449,7 +2437,6 @@ if (current_toolchain == default_toolchain) {
@@ -2465,7 +2453,6 @@ if (current_toolchain == default_toolchain) {
# is in a DFM.
android_library("base_module_java") {
sources = [
@@ -216,7 +215,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
"java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
@@ -2465,8 +2452,6 @@ if (current_toolchain == default_toolchain) {
@@ -2481,8 +2468,6 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
@@ -225,7 +224,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
@@ -2491,17 +2476,11 @@ if (current_toolchain == default_toolchain) {
@@ -2507,17 +2492,11 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
@@ -243,7 +242,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/browser/download/android:file_provider_java",
@@ -2515,7 +2494,6 @@ if (current_toolchain == default_toolchain) {
@@ -2531,7 +2510,6 @@ if (current_toolchain == default_toolchain) {
"//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
@@ -251,7 +250,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_collection_collection_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2534,7 +2512,6 @@ if (current_toolchain == default_toolchain) {
@@ -2550,7 +2528,6 @@ if (current_toolchain == default_toolchain) {
# Deps to pull services into base module.
# TODO(crbug.com/1126301): Consider moving these to the chrome module to
# reduce base dex size.
@@ -262,7 +261,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
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
@@ -15,7 +15,6 @@ chrome_java_sources = [
@@ -16,7 +16,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java",
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
"java/src/org/chromium/chrome/browser/ChromeApplicationImpl.java",
@@ -270,7 +269,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -933,10 +932,6 @@ chrome_java_sources = [
@@ -982,10 +981,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
@@ -296,7 +295,7 @@ diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/and
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -111,21 +111,16 @@ by a child template that "extends" this file.
@@ -114,21 +114,16 @@ by a child template that "extends" this file.
<permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
<permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
<permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -317,8 +316,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
{% block extra_uses_permissions %}
@@ -780,16 +775,6 @@ by a child template that "extends" this file.
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
@@ -799,16 +794,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@@ -335,7 +334,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
android:launchMode="singleInstance"
@@ -981,26 +966,6 @@ by a child template that "extends" this file.
@@ -1000,26 +985,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -362,7 +361,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- Android Notification service listener -->
<service android:name="org.chromium.chrome.browser.notifications.NotificationService"
android:exported="false"/>
@@ -1031,20 +996,10 @@ by a child template that "extends" this file.
@@ -1050,20 +1015,10 @@ by a child template that "extends" this file.
<service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>
@@ -383,7 +382,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
android:exported="true"
tools:ignore="ExportedService" />
@@ -1276,12 +1231,6 @@ by a child template that "extends" this file.
@@ -1295,12 +1250,6 @@ by a child template that "extends" this file.
{% endif %}
@@ -396,19 +395,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- These providers are declared in the base module to give the chrome
split preloader more time to work. -->
<provider android:name="org.chromium.chrome.browser.util.ChromeFileProvider"
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -58,9 +58,4 @@ found in the LICENSE file.
android:summary="@string/improve_search_suggestions_summary"
android:persistent="false"/>
</PreferenceCategory>
- <Preference
- android:key="phone_as_a_security_key"
- android:title="@string/cablev2_paask_title"
- android:summary="@string/cablev2_paask_body"
- android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/>
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
@@ -422,7 +408,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
import org.chromium.base.ContextUtils;
import org.chromium.base.PackageUtils;
import org.chromium.base.annotations.CalledByNative;
@@ -218,16 +215,9 @@ public abstract class AppHooks {
@@ -245,11 +242,7 @@ public abstract class AppHooks {
* same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
*/
public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
@@ -434,12 +420,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
+ return 1; /* SERVICE_MISSING*/
}
- /**
- * This is deprecated, and should not be called. Use FeedHooks instead.
- */
public @Nullable ProcessScope getExternalSurfaceProcessScope(
ProcessScopeDependencyProvider dependencies) {
return null;
/**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
@@ -753,7 +734,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -122,7 +122,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -124,7 +124,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
private Preference mLinkPref;
private Menu mMenu;
@@ -761,7 +742,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
private @ManagePasswordsReferrer int mManagePasswordsReferrer;
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
@@ -185,7 +184,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -191,7 +190,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -769,7 +750,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
computeTrustedVaultBannerState();
}
@@ -289,9 +287,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -295,9 +293,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
createSavePasswordsSwitch();
createAutoSignInCheckbox();
@@ -779,7 +760,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
createTrustedVaultBanner(R.string.android_trusted_vault_banner_sub_label_opted_in,
@@ -466,10 +461,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -475,10 +470,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
// by the system.
if (getActivity().isFinishing()) {
PasswordManagerHandlerProvider.getInstance().removeObserver(this);
@@ -813,7 +794,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7051,8 +7051,6 @@ static_library("browser") {
@@ -7100,8 +7100,6 @@ static_library("browser") {
"offline_pages/offliner_helper.h",
"offline_pages/offliner_user_data.cc",
"offline_pages/offliner_user_data.h",
@@ -949,7 +930,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -214,8 +212,6 @@ robolectric_binary("password_manager_junit_tests") {
@@ -216,8 +214,6 @@ robolectric_binary("password_manager_junit_tests") {
":public_impl_java",
":settings_interface_java",
":test_support_java",
@@ -982,7 +963,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
return AndroidBackendErrorType.UNCATEGORIZED;
}
@@ -40,44 +33,10 @@ class PasswordManagerAndroidBackendUtil {
@@ -40,44 +33,15 @@ class PasswordManagerAndroidBackendUtil {
return ((PasswordCheckupClientHelper.PasswordCheckBackendException) exception)
.errorCode;
}
@@ -997,10 +978,11 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
- return ((ApiException) exception).getStatusCode();
- }
- return 0; // '0' means SUCCESS.
- }
-
- @Nullable
- static Integer getConnectionResultCode(Exception exception) {
+ return 13; // '13' means ERROR
}
@Nullable
static Integer getConnectionResultCode(Exception exception) {
- if (!(exception instanceof ApiException)) return null;
-
- ConnectionResult connectionResult =
@@ -1025,9 +1007,53 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
- } catch (PendingIntent.CanceledException e) {
- Log.e(TAG, "Can not launch error resolution intent", e);
- }
+ return 13; // '13' means ERROR
+ return null;
}
}
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
@@ -21,9 +21,6 @@ import android.os.SystemClock;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.ApiException;
-
import org.chromium.base.Callback;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.ObservableSupplier;
@@ -417,21 +414,6 @@ public class PasswordManagerHelper {
}
public static void launchGmsUpdate(Context context) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- String deepLinkUrl = "market://details?id="
- + GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE + "&referrer=" + STORE_REFERER;
-
- intent.setPackage("com.android.vending");
- intent.setData(Uri.parse(deepLinkUrl));
- intent.putExtra("callerId", context.getPackageName());
-
- // Request for overlay flow, Play Store will fallback to the default
- // behaviour if overlay is not available.
- // TODO(crbug.com/1348506): Use AlleyOop v3 overlay UI after fixing Chrome restart
- // during the GMS Core installation.
- // intent.putExtra("overlay", true);
-
- context.startActivity(intent);
}
@VisibleForTesting
@@ -518,7 +500,7 @@ public class PasswordManagerHelper {
RecordHistogram.recordEnumeratedHistogram(kGetIntentErrorHistogram,
CredentialManagerError.API_ERROR, CredentialManagerError.COUNT);
- if (!(exception instanceof ApiException)) return;
+ if ((true)) return;
final String kGetIntentApiErrorHistogram = forAccount
? ACCOUNT_GET_INTENT_API_ERROR_HISTOGRAM
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
@@ -1039,8 +1065,8 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
-
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.components.signin.base.CoreAccountInfo;
@@ -69,11 +67,6 @@ class PasswordSyncControllerDelegateBridgeImpl {
@@ -73,11 +71,6 @@ class PasswordSyncControllerDelegateBridgeImpl {
error = ((PasswordStoreAndroidBackend.BackendException) exception).errorCode;
}
@@ -1052,17 +1078,6 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
PasswordSyncControllerDelegateBridgeImplJni.get().onCredentialManagerError(
mNativeDelegateBridgeImpl, error, apiErrorCode);
}
diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
--- a/chrome/browser/privacy/BUILD.gn
+++ b/chrome/browser/privacy/BUILD.gn
@@ -11,6 +11,7 @@ if (is_android) {
"//chrome/android:*",
"//chrome/browser/feed/android:*",
"//chrome/browser/ui/android/omnibox:*",
+ "//chrome/browser/ui/android/signin:*",
]
sources = [
"java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java",
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
build/patches/Remove-voice-recognition-integration.patch
+29 -50
View File
@@ -10,7 +10,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../browser/metrics/UmaSessionStats.java | 19 ---
.../chrome/browser/ntp/NewTabPage.java | 41 +------
.../browser/ntp/search/SearchBoxMediator.java | 29 +----
.../PasswordCheckupLauncher.java | 3 +-
.../browser/searchwidget/SearchActivity.java | 8 +-
.../SearchActivityLocationBarLayout.java | 42 +------
.../browser/toolbar/ToolbarManager.java | 6 -
@@ -23,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../suggestions/AutocompleteController.java | 21 ----
.../suggestions/AutocompleteCoordinator.java | 8 --
.../suggestions/AutocompleteMediator.java | 9 --
19 files changed, 12 insertions(+), 359 deletions(-)
18 files changed, 11 insertions(+), 357 deletions(-)
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -103,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.photo_picker.DecoderService;
@@ -427,10 +426,6 @@ public class ProcessInitializationHandler {
@@ -437,10 +436,6 @@ public class ProcessInitializationHandler {
deferredStartupHandler.addDeferredTask(
() -> OfflineMeasurementsBackgroundTask.clearPersistedDataFromPrefs());
deferredStartupHandler.addDeferredTask(() -> QueryTileUtils.isQueryTilesEnabledOnNTP());
@@ -275,7 +274,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -37,14 +36,13 @@ import java.util.ArrayList;
@@ -38,14 +37,13 @@ import java.util.ArrayList;
import java.util.List;
class SearchBoxMediator
@@ -291,7 +290,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear
/** Constructor. */
SearchBoxMediator(Context context, PropertyModel model, ViewGroup view) {
@@ -71,11 +69,6 @@ class SearchBoxMediator
@@ -72,11 +70,6 @@ class SearchBoxMediator
@Override
public void onDestroy() {
@@ -303,7 +302,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear
if (mActivityLifecycleDispatcher != null) {
mActivityLifecycleDispatcher.unregister(this);
mActivityLifecycleDispatcher = null;
@@ -84,26 +77,6 @@ class SearchBoxMediator
@@ -85,26 +78,6 @@ class SearchBoxMediator
@Override
public void onFinishNativeInitialization() {
@@ -330,26 +329,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear
}
/** Called to set a click listener for the search box. */
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java
@@ -13,7 +13,6 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
import org.chromium.chrome.browser.AppHooks;
import org.chromium.chrome.browser.password_check.PasswordCheckFactory;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.modaldialog.ModalDialogManager;
@@ -35,7 +34,7 @@ public class PasswordCheckupLauncher {
if (PasswordManagerHelper.canUseUpm()) {
PasswordManagerHelper.showPasswordCheckup(windowAndroid.getContext().get(),
- passwordCheckReferrer, SyncService.get(),
+ passwordCheckReferrer,
getModalDialogManagerSupplier(windowAndroid));
return;
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
@@ -496,15 +475,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -87,7 +87,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
@@ -86,7 +86,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
@@ -2086,11 +2085,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
import org.chromium.chrome.browser.price_tracking.PriceTrackingFeatures;
@@ -2085,11 +2084,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub();
}
@@ -519,7 +498,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -89,8 +89,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
@@ -90,8 +90,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
@@ -527,8 +506,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource;
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
@@ -270,7 +268,6 @@ public class RootUiCoordinator
import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
@@ -275,7 +273,6 @@ public class RootUiCoordinator
protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
protected Supplier<Tab> mStartSurfaceParentTabSupplier;
@Nullable
@@ -536,7 +515,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
private MediaCaptureOverlayController mCaptureController;
private @Nullable ScrollCaptureManager mScrollCaptureManager;
protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
@@ -553,9 +550,6 @@ public class RootUiCoordinator
@@ -559,9 +556,6 @@ public class RootUiCoordinator
}
if (mToolbarManager != null) {
@@ -546,7 +525,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1072,19 +1066,11 @@ public class RootUiCoordinator
@@ -1109,19 +1103,11 @@ public class RootUiCoordinator
new VoiceToolbarButtonController.VoiceSearchDelegate() {
@Override
public boolean isVoiceSearchEnabled() {
@@ -567,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
};
TranslateToolbarButtonController translateToolbarButtonController =
@@ -1145,13 +1131,6 @@ public class RootUiCoordinator
@@ -1189,13 +1175,6 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
@@ -665,7 +644,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
@@ -89,8 +87,7 @@ import java.util.function.BooleanSupplier;
@@ -90,8 +88,7 @@ import java.util.function.BooleanSupplier;
* currently, migration of this logic out of LocationBarLayout is in progress.
*/
class LocationBarMediator
@@ -675,7 +654,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
UrlBarDelegate, OnKeyListener, ComponentCallbacks,
TemplateUrlService.TemplateUrlServiceObserver, BackPressHandler {
private static final int ICON_FADE_ANIMATION_DURATION_MS = 150;
@@ -150,10 +147,7 @@ class LocationBarMediator
@@ -151,10 +148,7 @@ class LocationBarMediator
};
private final LocationBarLayout mLocationBarLayout;
@@ -686,7 +665,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private StatusCoordinator mStatusCoordinator;
private AutocompleteCoordinator mAutocompleteCoordinator;
private OmniboxPrerender mOmniboxPrerender;
@@ -220,9 +214,6 @@ class LocationBarMediator
@@ -221,9 +215,6 @@ class LocationBarMediator
mLocationBarDataProvider.addObserver(this);
mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate;
mLocaleManager = localeManager;
@@ -696,7 +675,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mProfileSupplier = profileSupplier;
mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile));
mPrivacyPreferencesManager = privacyPreferencesManager;
@@ -258,9 +249,6 @@ class LocationBarMediator
@@ -259,9 +250,6 @@ class LocationBarMediator
}
/*package */ void destroy() {
@@ -706,7 +685,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
if (mTemplateUrlServiceSupplier.hasValue()) {
mTemplateUrlServiceSupplier.get().removeObserver(this);
}
@@ -268,8 +256,6 @@ class LocationBarMediator
@@ -269,8 +257,6 @@ class LocationBarMediator
mAutocompleteCoordinator = null;
mUrlCoordinator = null;
mPrivacyPreferencesManager = null;
@@ -715,7 +694,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mLocationBarDataProvider.removeObserver(this);
mDeferredNativeRunnables.clear();
mUrlFocusChangeListeners.clear();
@@ -326,13 +312,6 @@ class LocationBarMediator
@@ -327,13 +313,6 @@ class LocationBarMediator
mOmniboxPrerender = new OmniboxPrerender();
mTemplateUrlServiceSupplier.onAvailable((templateUrlService) -> {
templateUrlService.addObserver(this);
@@ -729,7 +708,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
});
mLocationBarLayout.onFinishNativeInitialization();
@@ -383,17 +362,6 @@ class LocationBarMediator
@@ -384,17 +363,6 @@ class LocationBarMediator
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
}
@@ -747,7 +726,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setLensControllerForTesting(LensController lensController) {
mLensController = lensController;
}
@@ -402,11 +370,6 @@ class LocationBarMediator
@@ -403,11 +371,6 @@ class LocationBarMediator
sLastCachedIsLensOnOmniboxEnabled = null;
}
@@ -759,7 +738,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setIsUrlBarFocusedWithoutAnimationsForTesting(
boolean isUrlBarFocusedWithoutAnimations) {
mUrlFocusedWithoutAnimations = isUrlBarFocusedWithoutAnimations;
@@ -606,8 +569,6 @@ class LocationBarMediator
@@ -607,8 +570,6 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(false, false);
RecordUserAction.record("MobileOmniboxVoiceSearch");
@@ -768,7 +747,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
/** package */ void lensButtonClicked(View view) {
@@ -959,28 +920,6 @@ class LocationBarMediator
@@ -960,28 +921,6 @@ class LocationBarMediator
}
}
@@ -797,7 +776,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/**
* Update visuals to use a correct color scheme depending on the primary color.
*/
@@ -1067,8 +1006,7 @@ class LocationBarMediator
@@ -1068,8 +1007,7 @@ class LocationBarMediator
private boolean shouldShowMicButton() {
if (shouldShowDeleteButton()) return false;
@@ -807,7 +786,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
return false;
}
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
@@ -1263,9 +1201,6 @@ class LocationBarMediator
@@ -1264,9 +1202,6 @@ class LocationBarMediator
public void onPrimaryColorChanged() {
// This method needs to be called first as it computes |mBrandedColorScheme|.
updateBrandedColorScheme();
@@ -817,7 +796,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
@Override
@@ -1351,16 +1286,6 @@ class LocationBarMediator
@@ -1352,16 +1287,6 @@ class LocationBarMediator
}
}
@@ -834,7 +813,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Override
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
mUrlFocusChangeListeners.addObserver(listener);
@@ -1376,37 +1301,10 @@ class LocationBarMediator
@@ -1377,37 +1302,10 @@ class LocationBarMediator
return mUrlHasFocus;
}
@@ -872,7 +851,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
public void setSearchQuery(String query) {
if (TextUtils.isEmpty(query)) return;
@@ -1425,17 +1323,14 @@ class LocationBarMediator
@@ -1426,17 +1324,14 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(true, false);
}
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+60 -10
View File
@@ -9,6 +9,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/browser/BUILD.gn | 8 -
.../android/metrics/uma_session_stats.cc | 10 -
.../android/signin/signin_manager_android.cc | 27 +-
chrome/browser/browser_process_impl.cc | 1 -
.../browser/chrome_content_browser_client.cc | 19 --
.../domain_reliability/service_factory.cc | 33 +-
@@ -26,6 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../new_tab_page/promos/promo_service.cc | 6 +-
.../from_gws_page_load_metrics_observer.cc | 6 +-
.../page_load_metrics_initialize.cc | 2 -
chrome/browser/safe_browsing/BUILD.gn | 1 -
.../ui_thread_search_terms_data.cc | 4 -
chrome/browser/ui/BUILD.gn | 1 -
.../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 -
@@ -52,12 +54,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/url_matcher/url_util.cc | 83 -----
net/base/url_util.cc | 21 --
services/network/network_context.cc | 2 +-
45 files changed, 61 insertions(+), 765 deletions(-)
47 files changed, 65 insertions(+), 789 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -973,10 +973,6 @@ static_library("browser") {
@@ -982,10 +982,6 @@ static_library("browser") {
"page_load_metrics/observers/foreground_duration_ukm_observer.h",
"page_load_metrics/observers/formfill_page_load_metrics_observer.cc",
"page_load_metrics/observers/formfill_page_load_metrics_observer.h",
@@ -68,7 +70,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/histogram_suffixes.cc",
"page_load_metrics/observers/histogram_suffixes.h",
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
@@ -1854,7 +1850,6 @@ static_library("browser") {
@@ -1865,7 +1861,6 @@ static_library("browser") {
"//chrome/browser/autofill",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -76,7 +78,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/profiling_host",
# TODO(crbug.com/1335199): break this dep when favicon is in its own target
@@ -1878,7 +1873,6 @@ static_library("browser") {
@@ -1889,7 +1884,6 @@ static_library("browser") {
public_deps = [
"//base",
@@ -84,7 +86,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/headless",
"//chrome/common",
"//chrome/common:buildflags",
@@ -7363,8 +7357,6 @@ static_library("browser") {
@@ -7416,8 +7410,6 @@ static_library("browser") {
"supervised_user/parental_control_metrics.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
@@ -113,10 +115,47 @@ diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browse
}
// Initialize the local consent bool variable to false. Used only for testing.
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -56,29 +56,10 @@ class ProfileDataRemover : public content::BrowsingDataRemover::Observer {
remover_(profile->GetBrowsingDataRemover()) {
remover_->AddObserver(this);
- if (all_data) {
- remover_->RemoveAndReply(base::Time(), base::Time::Max(),
- chrome_browsing_data_remover::ALL_DATA_TYPES,
- chrome_browsing_data_remover::ALL_ORIGIN_TYPES,
- this);
- } else {
- std::unique_ptr<content::BrowsingDataFilterBuilder> google_tld_filter =
- content::BrowsingDataFilterBuilder::Create(
- content::BrowsingDataFilterBuilder::Mode::kDelete);
-
- // TODO(msramek): BrowsingDataFilterBuilder was not designed for
- // large filters. Optimize it.
- for (const std::string& domain :
- google_util::GetGoogleRegistrableDomains()) {
- google_tld_filter->AddRegisterableDomain(domain);
- }
-
- remover_->RemoveWithFilterAndReply(
- base::Time(), base::Time::Max(),
- content::BrowsingDataRemover::DATA_TYPE_CACHE_STORAGE,
- chrome_browsing_data_remover::ALL_ORIGIN_TYPES,
- std::move(google_tld_filter), this);
- }
+ remover_->RemoveAndReply(base::Time(), base::Time::Max(),
+ chrome_browsing_data_remover::ALL_DATA_TYPES,
+ chrome_browsing_data_remover::ALL_ORIGIN_TYPES,
+ this);
}
ProfileDataRemover(const ProfileDataRemover&) = delete;
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1123,7 +1123,6 @@ BrowserProcessImpl::component_updater() {
@@ -1135,7 +1135,6 @@ BrowserProcessImpl::component_updater() {
std::make_unique<component_updater::TimerUpdateScheduler>();
std::string brand;
@@ -127,7 +166,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2859,7 +2859,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2861,7 +2861,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kForcePNaClSubzero,
#endif
switches::kForceUIDirection,
@@ -135,7 +174,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
switches::kJavaScriptHarmony,
switches::kEnableExperimentalWebAssemblyFeatures,
embedder_support::kOriginTrialDisabledFeatures,
@@ -4964,12 +4963,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4966,12 +4965,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -148,7 +187,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
if (auto* throttle_manager =
subresource_filter::ContentSubresourceFilterThrottleManager::
FromNavigationHandle(*handle)) {
@@ -5519,18 +5512,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
@@ -5517,18 +5510,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
}
#endif
@@ -559,6 +598,17 @@ diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/
tracker->AddObserver(std::make_unique<ForegroundDurationUKMObserver>());
tracker->AddObserver(
std::make_unique<DocumentWritePageLoadMetricsObserver>());
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -24,7 +24,6 @@ static_library("safe_browsing") {
"//build:branding_buildflags",
"//chrome/app:generated_resources",
"//chrome/browser:browser_process",
- "//chrome/browser/google",
"//chrome/browser/profiles",
"//chrome/browser/profiles:profile",
"//chrome/common",
diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
--- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -653,7 +703,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5978,7 +5978,6 @@ test("unit_tests") {
@@ -5982,7 +5982,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",