Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239c7e35 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '4109-master-update' into 'master' 

Update browser to v145.0.7632.109

See merge request !123
parents d212040e d49ac66a

build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch

+3 −3
Original line number Diff line number Diff line 
From 3067dd5a86d890084bccd989fd89ad16d05f5dd5 Mon Sep 17 00:00:00 2001

From 0d2eb25a97bf7126a93076463830f35931091ef0 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 08:03:13 +0000

Subject: Browser: Add provider to share default search engine
@@ -13,10 +13,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java



diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index 877bcb7009103..30066d4b56ad1 100644

index 631a4d39eec07..e9c9e7c1a5890 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -1416,6 +1416,12 @@ by a child template that "extends" this file.

@@ -1427,6 +1427,12 @@ by a child template that "extends" this file.

           tools:ignore="ExportedContentProvider">

       </provider>

build/e_patches/Browser-Change-adblock-url-to-ours.patch

+6 −6
Original line number Diff line number Diff line 
From 9c0cff1f56b7d661da3cdfce5c7aea2394dcd9da Mon Sep 17 00:00:00 2001

From c6f7f96594b1702e098872fcd3da2938bf676af4 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 10 Sep 2024 12:17:23 +0530

Subject: Browser: Change adblock url to ours
@@ -44,10 +44,10 @@ index ef6d1652c97f0..24cd56084827d 100644 
         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());

         mAdBlockFiltersUrlEdit.addTextChangedListener(this);

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index 457f90c651dcd..80c9262dd199f 100644

index 0a71e3d23624a..276df0f2fc755 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -1295,11 +1295,11 @@ BrowserProcessImpl::adblock_updater() {

@@ -1356,11 +1356,11 @@ BrowserProcessImpl::adblock_updater() {

   std::unique_ptr<component_updater::UpdateScheduler> scheduler =

       std::make_unique<component_updater::TimerUpdateScheduler>();
@@ -64,7 +64,7 @@ index 457f90c651dcd..80c9262dd199f 100644 
   }

 

   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(

@@ -1307,7 +1307,7 @@ BrowserProcessImpl::adblock_updater() {

@@ -1368,7 +1368,7 @@ BrowserProcessImpl::adblock_updater() {

           std::move(scheduler),

           g_browser_process->subresource_filter_ruleset_service(),

           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -74,10 +74,10 @@ index 457f90c651dcd..80c9262dd199f 100644 
   return adblock_updater_.get();

 }

diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc

index 7f0c1bbab4cd5..fe4c641aa4d31 100644

index 6dc1f8b92d1e8..00260f8cf9785 100644

--- a/chrome/browser/net/system_network_context_manager.cc

+++ b/chrome/browser/net/system_network_context_manager.cc

@@ -721,7 +721,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {

@@ -723,7 +723,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {

 

   registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);

   registry->RegisterStringPref(prefs::kAdBlockFiltersURL,

build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch

+3 −3
Original line number Diff line number Diff line 
From 8ae490ff6c15489b6779a3f36bb1ca6b6532b90d Mon Sep 17 00:00:00 2001

From 1524f3b74f7771ead9a02805c07dd340046f9cf2 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 22 Aug 2023 06:16:40 +0000

Subject: Browser: Disable Android native autofill by default
@@ -9,10 +9,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc

index 8a0a685044e96..b23dd18850059 100644

index 0472ddbe1cb4c..5ff42c631192d 100644

--- a/components/autofill/core/common/autofill_prefs.cc

+++ b/components/autofill/core/common/autofill_prefs.cc

@@ -78,7 +78,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

@@ -85,7 +85,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

   registry->RegisterBooleanPref(kAutofillCreditCardFidoAuthOfferCheckboxState,

                                 true);

 #endif

build/e_patches/Browser-Enable-custom-tabs-by-default.patch

+5 −5
Original line number Diff line number Diff line 
From b586fbb4df2778b7f00d9b232099ea902ce0ebd4 Mon Sep 17 00:00:00 2001

From d5cc16693b3795f3daa8be6a092734f4195ba4ec Mon Sep 17 00:00:00 2001

From: Aayush Gupta <aayushgupta219@gmail.com>

Date: Mon, 29 Nov 2021 03:37:37 +0000

Subject: Browser: Enable custom tabs by default
@@ -12,10 +12,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

index 69b52ab756b19..0dcbabc9dd501 100644

index 63ee2aac22e69..9ec549920e682 100644

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -51,7 +51,7 @@ found in the LICENSE file.

@@ -45,7 +45,7 @@ found in the LICENSE file.

         android:key="allow_custom_tab_intents"

         android:title="@string/allow_custom_tab_intents_title"

         android:summary="@string/allow_custom_tab_intents_summary"
@@ -25,10 +25,10 @@ index 69b52ab756b19..0dcbabc9dd501 100644 
         android:title="@string/uses_separate_storagepartition_for_cct_title"

         android:summary="@string/uses_separate_storagepartition_for_cct_summary"

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

index 5fdd31a849449..d082bd2e19eaa 100644

index 9308e6f855249..4a401a5e6a864 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

@@ -278,7 +278,7 @@ public class LaunchIntentDispatcher {

@@ -142,7 +142,7 @@ public class LaunchIntentDispatcher {

     public static boolean isCustomTabIntent(Intent intent) {

         if (intent == null) return false;

         if (!ContextUtils.getAppSharedPreferences()

build/e_patches/Browser-Enable-do-not-track-by-default.patch

+3 −3
Original line number Diff line number Diff line 
From b22a39db25acbd8c23b2e7bc76d9748d132bd5db Mon Sep 17 00:00:00 2001

From af40c4d68bb02000ae035c7425a3b1ce00b03df0 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 26 Nov 2021 07:34:57 +0000

Subject: Browser: Enable do not track by default
@@ -9,10 +9,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc

index f15498ed705a3..bb11e46df10f6 100644

index b6aee61aee2ba..9497a8852504a 100644

--- a/chrome/browser/ui/browser_ui_prefs.cc

+++ b/chrome/browser/ui/browser_ui_prefs.cc

@@ -139,7 +139,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

@@ -137,7 +137,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);

   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);

   registry->RegisterBooleanPref(