Commit 1a4d0086 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Bump to version 99.0.4844.77


Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent cde85ccf
Pipeline #172423 failed with stages
in 83 minutes and 48 seconds
bromite @ 47d0d4f9
Subproject commit f645da9e44acdecb6040021b0428ff663fdda376
Subproject commit 47d0d4f9f8e3443a2204f7bbebcd83b068d6debd
android_channel="stable"
blink_symbol_level=1
build_contextual_search=false
build_with_tflite_lib=false
chrome_pgo_phase=0
dcheck_always_on=false
......
......@@ -7,9 +7,8 @@
0007-Browser-Disable-async-DNS-by-default-on-Android.patch
0008-Browser-Enable-custom-tabs-by-default.patch
0009-Browser-Enable-search-suggestion-by-default.patch
0010-Browser-Hide-and-disable-touch-to-search-option.patch
0011-Browser-Modify-default-search-engines.patch
0012-Browser-Redirect-users-to-e-foundation-docs.patch
0013-Revert-Bromite-auto-updater.patch
0014-Revert-Block-gateway-attacks-via-websockets.patch
0015-Revert-Disable-unified-autoplay-feature.patch
0010-Browser-Modify-default-search-engines.patch
0011-Browser-Redirect-users-to-e-foundation-docs.patch
0012-Revert-Bromite-auto-updater.patch
0013-Revert-Block-gateway-attacks-via-websockets.patch
0014-Revert-Disable-unified-autoplay-feature.patch
From 8a9f242453259a31df1f00085ca09798cd7113bb Mon Sep 17 00:00:00 2001
From 1a9bc10a81de7705467f7c3a745b811eef40efa2 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH 01/15] Browser: Change app and package name to browser
Subject: [PATCH 01/14] Browser: Change app and package name to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 3a2417c58db15..296d91464a9f3 100644
index 4058341db4cdd..5ac0eb1185ebb 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
......
From e4a464f34d21e4a2ad882468bab023661ab7b867 Mon Sep 17 00:00:00 2001
From c11a8ddf7f8729fdcdbdf660471ebe5f1e3a847e Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 06:04:08 +0000
Subject: [PATCH 02/15] Browser: Use our custom icon instead of chromium
Subject: [PATCH 02/14] Browser: Use our custom icon instead of chromium
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From 5672885ee961d8b59108290cc358ddf434e32255 Mon Sep 17 00:00:00 2001
From c23ad1b3371d620411b20a1659b411b7e2073185 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:12:30 +0000
Subject: [PATCH 03/15] Browser: Rename strings to browser
Subject: [PATCH 03/14] Browser: Rename strings to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -172,7 +172,7 @@ index e92bc2b2739c2..af6d85d9da4cd 100644
.with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
resources.getString(R.string.auto_dark_message_button))
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 7a1d1a65ba519..5ec76764c0d30 100644
index 09c7ba8a1671c..2f9a418e092de 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -198,6 +198,8 @@ CHAR_LIMIT guidelines:
......
From 0fbb7978b4aa394855a8477fe4077bb3089fc708 Mon Sep 17 00:00:00 2001
From be0460c7a12a508b2c033e6bd9c4c0636d290dda Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:29:59 +0000
Subject: [PATCH 04/15] Browser: Point to our default popular sites
Subject: [PATCH 04/14] Browser: Point to our default popular sites
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From 76cc303c1f82d751c837fd0c5bfecfd1008b87be Mon Sep 17 00:00:00 2001
From e6eeb49dd5c4878daf41b6bcd419b348254e7fde Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:34:57 +0000
Subject: [PATCH 05/15] Browser: Enable do not track by default
Subject: [PATCH 05/14] Browser: Enable do not track by default
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From b566f5a6cd6316e0b9310f92dea48bbc49ca32a3 Mon Sep 17 00:00:00 2001
From 82e95e3c430b9de98d35e8d54be4f6f6791420ab Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: [PATCH 06/15] Browser: Add provider to share default search engine
Subject: [PATCH 06/14] Browser: Add provider to share default search engine
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From 2f9398da8bcdafd81068e2224cf9f2753be93550 Mon Sep 17 00:00:00 2001
From 1a8bf5720449c80742f62a8d7b159ffa229653b2 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:26:03 +0000
Subject: [PATCH 07/15] Browser: Disable async DNS by default on Android
Subject: [PATCH 07/14] Browser: Disable async DNS by default on Android
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From f333a0a4445113a24c1b10785ac8f9fc7fef0fe1 Mon Sep 17 00:00:00 2001
From ce22f4473bfd8f6d743fc3a43beb2aaa393eb297 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:37:37 +0000
Subject: [PATCH 08/15] Browser: Enable custom tabs by default
Subject: [PATCH 08/14] Browser: Enable custom tabs by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
index 46d3aa0bf1dc2..c0efbabce4170 100644
index 4f5751b297aba..92c13bd579f6b 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -69,7 +69,7 @@
@@ -70,7 +70,7 @@
android:key="allow_custom_tab_intents"
android:title="@string/allow_custom_tab_intents_title"
android:summary="@string/allow_custom_tab_intents_summary"
......
From 9952bb23a24e46559f11324755d9bd953dd8ddf9 Mon Sep 17 00:00:00 2001
From 1240045afc0eeb9984aae658229b094b7ae89e84 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:39:21 +0000
Subject: [PATCH 09/15] Browser: Enable search suggestion by default
Subject: [PATCH 09/14] Browser: Enable search suggestion by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......
From 8e6c2961683e8fa7e9ead0c30750738c93dccc73 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:54:44 +0000
Subject: [PATCH 10/15] Browser: Hide and disable touch to search option
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
chrome/android/java/res/xml/privacy_preferences.xml | 3 ++-
.../contextualsearch/ContextualSearchPreferenceFragment.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
index c0efbabce4170..fcba9e6b864c2 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -91,7 +91,8 @@
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="contextual_search"
android:title="@string/contextual_search_title"
- android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
+ android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"
+ app:isPreferenceVisible="false"/>
</PreferenceCategory>
<Preference
android:key="phone_as_a_security_key"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
index 27f7461a76ad7..58c41debb8450 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
@@ -44,8 +44,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat
ChromeSwitchPreference seeBetterResultsSwitch =
(ChromeSwitchPreference) findPreference(PREF_WAS_FULLY_ENABLED_SWITCH);
- boolean isContextualSearchEnabled = !ContextualSearchPolicy.isContextualSearchDisabled();
+ boolean isContextualSearchEnabled = false;
contextualSearchSwitch.setChecked(isContextualSearchEnabled);
+ contextualSearchSwitch.setEnabled(isContextualSearchEnabled);
contextualSearchSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
ContextualSearchPolicy.setContextualSearchState((boolean) newValue);
--
2.25.1
From af38263f9a1e254e4c05e86524284b3af1fee323 Mon Sep 17 00:00:00 2001
From a9ff10ba51d21464cfc9f4043ae3f4edde64a34e Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:42:44 +0100
Subject: [PATCH 11/15] Browser: Modify default search engines
Subject: [PATCH 10/14] Browser: Modify default search engines
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From a9beacb5189075526e01323944f632af4ae34508 Mon Sep 17 00:00:00 2001
From d444af088c0e718f90113010351ec91250bab1fd Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 11 May 2021 14:22:00 +0200
Subject: [PATCH 12/15] Browser: Redirect users to e foundation docs
Subject: [PATCH 11/14] Browser: Redirect users to e foundation docs
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From 6ef37147c4e7cc37b8bf8e64b169bebb7c618d4d Mon Sep 17 00:00:00 2001
From 98ec13102d94e8c21b4a2f6db8366c3a523a8ebc Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 8 Mar 2022 07:37:20 +0000
Subject: [PATCH 13/15] Revert "Bromite auto updater"
Date: Tue, 22 Mar 2022 08:33:34 +0000
Subject: [PATCH 12/14] Revert "Bromite auto updater"
This reverts commit 4c581e3fa18ce8b99c5ec9a7c748d19de937d38b.
This reverts commit 58a8f31d01b833437080ecdfb48cffbd12602a59.
---
.../java/templates/BuildConfig.template | 2 -
build/config/android/rules.gni | 3 -
chrome/android/chrome_java_sources.gni | 3 -
.../java/res/xml/about_chrome_preferences.xml | 5 -
.../about_settings/AboutChromeSettings.java | 27 +-
.../chrome/browser/omaha/OmahaBase.java | 57 +----
.../chrome/browser/omaha/OmahaBase.java | 57 +---
.../chrome/browser/omaha/UpdateConfigs.java | 30 +--
.../browser/omaha/UpdateMenuItemHelper.java | 81 +-----
.../browser/omaha/UpdateMenuItemHelper.java | 82 +-----
.../browser/omaha/UpdateStatusProvider.java | 161 +++---------
.../browser/omaha/VersionNumberGetter.java | 3 +-
.../inline/BromiteInlineUpdateController.java | 241 ------------------
.../inline/BromiteInlineUpdateController.java | 243 ------------------
.../omaha/inline/InlineUpdateController.java | 51 ----
.../inline/InlineUpdateControllerFactory.java | 21 --
chrome/browser/endpoint_fetcher/BUILD.gn | 2 -
......@@ -27,7 +27,7 @@ This reverts commit 4c581e3fa18ce8b99c5ec9a7c748d19de937d38b.
.../flags/android/chrome_feature_list.h | 1 -
.../browser/flags/ChromeFeatureList.java | 1 -
.../strings/android_chrome_strings.grd | 23 +-
22 files changed, 55 insertions(+), 894 deletions(-)
22 files changed, 55 insertions(+), 897 deletions(-)
delete mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
delete mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java
delete mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
......@@ -59,10 +59,10 @@ index 210487e0f18c8..6c67ac93f8bfc 100644
}
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 36ba02f38bb9e..758ebc7438909 100644
index 02df4dd5b9121..f52e41f69039b 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -865,9 +865,6 @@ chrome_java_sources = [
@@ -802,9 +802,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
......@@ -310,7 +310,7 @@ index 700aa4c218c8c..e992298f27051 100644
+}
\ No newline at end of file
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
index 6b1e9ec8db1ac..0a3da975789f2 100644
index edefafd4faf15..0a3da975789f2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
@@ -11,7 +11,6 @@ import android.text.TextUtils;
......@@ -352,7 +352,7 @@ index 6b1e9ec8db1ac..0a3da975789f2 100644
// The badge is hidden if the update menu item has been clicked until there is an
// even newer version of Chrome available.
showBadge |= !TextUtils.equals(
@@ -284,71 +270,6 @@ public class UpdateMenuItemHelper {
@@ -284,72 +270,6 @@ public class UpdateMenuItemHelper {
mMenuUiState.itemState.icon = R.drawable.ic_error_24dp_filled;
mMenuUiState.itemState.enabled = false;
break;
......@@ -382,6 +382,7 @@ index 6b1e9ec8db1ac..0a3da975789f2 100644
- mMenuUiState.buttonState.menuContentDescription = R.string.accessibility_toolbar_btn_menu_update;
- mMenuUiState.buttonState.darkBadgeIcon = R.drawable.badge_update_dark;
- mMenuUiState.buttonState.lightBadgeIcon = R.drawable.badge_update_light;
- mMenuUiState.buttonState.adaptiveBadgeIcon = R.drawable.badge_update;
- }
- }
-
......@@ -745,10 +746,10 @@ index 425b7fe17a863..6d21fb304fdd7 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
deleted file mode 100644
index 9a0665b2970d1..0000000000000
index 155e533724a6c..0000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
+++ /dev/null
@@ -1,241 +0,0 @@
@@ -1,243 +0,0 @@
-// Copyright 2021 The Ungoogled Chromium Authors. All rights reserved.
-//
-// This file is part of Ungoogled Chromium Android.
......@@ -891,7 +892,9 @@ index 9a0665b2970d1..0000000000000
- } else {
- checkLatestUpstreamVersion((latestUpstreamVersion) -> {
- if (latestUpstreamVersion == null) return;
- postStatus(UpdateStatusProvider.UpdateState.VULNERABLE_VERSION, VULNERABLE_VERSION_DOC_URL);
- if (OmahaBase.isNewVersionAvailableByVersion(latestUpstreamVersion)) {
- postStatus(UpdateStatusProvider.UpdateState.VULNERABLE_VERSION, VULNERABLE_VERSION_DOC_URL);
- }
- });
- }
- });
......@@ -1571,10 +1574,10 @@ index 1b25feb6e4760..92b6da65b5151 100644
public static final String INSTANCE_SWITCHER = "InstanceSwitcher";
public static final String INSTANT_START = "InstantStart";
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 5ec76764c0d30..98507713f24d7 100644
index 2f9a418e092de..d78f319433e9b 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1838,12 +1838,6 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1790,12 +1790,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
Chrome updates are no longer supported for this version of Android
</message>
......@@ -1587,7 +1590,7 @@ index 5ec76764c0d30..98507713f24d7 100644
<!-- Account management UI strings. -->
<message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
@@ -3391,10 +3385,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3343,10 +3337,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<!-- Main menu items -->
<message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
......@@ -1599,7 +1602,7 @@ index 5ec76764c0d30..98507713f24d7 100644
</message>
<message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
Newer version is available
@@ -3405,18 +3396,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3357,18 +3348,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
Android version is unsupported
</message>
......
From 9d656e6d5de3de5928d501653f2daac735fc97aa Mon Sep 17 00:00:00 2001
From 07964b031c5a851e61c139f0550945eebc84c88d Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 8 Mar 2022 07:37:49 +0000
Subject: [PATCH 14/15] Revert "Block gateway attacks via websockets"
Date: Tue, 22 Mar 2022 08:34:04 +0000
Subject: [PATCH 13/14] Revert "Block gateway attacks via websockets"
This reverts commit e99fc528c8d06f363f307f73487db70bc7092eb2.
This reverts commit eed9daba155d6440f85a55d4ebbf4da3914eedde.
---
.../renderer/core/loader/base_fetch_context.h | 1 -
.../core/loader/frame_fetch_context.cc | 20 -------------
......
From 44c17fdc9a2bca093abcf9023597323844654e27 Mon Sep 17 00:00:00 2001
From a03ac3483daaea85b274ab3ecf5e6866f50872fc Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 8 Mar 2022 07:38:13 +0000
Subject: [PATCH 15/15] Revert "Disable unified autoplay feature"
Date: Tue, 22 Mar 2022 08:34:28 +0000
Subject: [PATCH 14/14] Revert "Disable unified autoplay feature"
This reverts commit cc21cf49921b8cd96355d3e0bb62c1c9be219144.
This reverts commit a2e273b85e59dc44fb312047ca0cc07692114d3b.
---
media/base/media_switches.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment