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

Commit 58cdb3ff authored by Saalim Quadri's avatar Saalim Quadri
Browse files

Merge branch '3839-master-upstream' into 'master' 

Browser: Update to v143.0.7499.109

See merge request !118
parents c1e7c4dd 0fbeba0a

cromite @ 8e844cf6

Compare 73028c53 to 8e844cf6
Original line number Diff line number Diff line 
Subproject commit 73028c53c5508f8fd746958bef4cc911add0c8ac
 
Subproject commit 8e844cf64f8159a72f158eb33e2f09b19f7d115a

build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch

+4 −4
Original line number Diff line number Diff line 
From 7f1605628cf0147e7d5c65f7c8f0270ef0e108be Mon Sep 17 00:00:00 2001

From 95a80df1a08cce8b08ad37298b603a01f3e45144 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Thu, 11 Jul 2024 11:11:15 +0530

Subject: Browser: Hide settings when parental control is active
@@ -101,10 +101,10 @@ index f397da21bee2a..a3b2f6054bcdc 100644 
         SyncService syncService = SyncServiceFactory.getForProfile(getProfile());

         if (syncService != null) {

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

index aa24e51e85e6f..1c6ae7aeeea7a 100644

index c907228d8c108..d6e0a214842e7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.ActivityTabProvider;

@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.ActivityTabProvider;

 import org.chromium.chrome.browser.ai.AiAssistantService;

 import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;

 import org.chromium.chrome.browser.app.creator.CreatorActivity;
@@ -112,7 +112,7 @@ index aa24e51e85e6f..1c6ae7aeeea7a 100644 
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;

 import org.chromium.chrome.browser.device.DeviceConditions;

 import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;

@@ -914,12 +915,16 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -888,12 +889,16 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

     }

 

     private MVCListAdapter.ListItem buildSettingsItem() {

build/e_patches/Browser-Rename-strings-to-browser.patch

+2 −2
Original line number Diff line number Diff line 
From 8a7a8add372036a10ea9f14389096cf0a466ad43 Mon Sep 17 00:00:00 2001

From 4217d19cc3f691dcf3d5d955a213e78bce69b590 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 07:12:30 +0000

Subject: Browser: Rename strings to browser
@@ -54,7 +54,7 @@ index d782e5552b417..0c8ff21049cfc 100644 
 

     @Override

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index 6cb9a6c1fc4d8..c3271f0946be3 100644

index ae042b8744a52..05b98b2454274 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -202,6 +202,8 @@ CHAR_LIMIT guidelines:

build/e_patches/Disable-AGSA-by-default.patch

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

From fb8e209a35d3dfc9768dca12acf8368d2a4a9e7d Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 26 Sep 2021 11:17:53 +0200

Subject: Disable AGSA by default
@@ -76,7 +76,7 @@ index bb654b352a23e..a6c39e6e40606 100644 
             return ExternalAppId.CHROME;

         } else if (assumeNonNull(packageName).startsWith(WEBAPK_PACKAGE_PREFIX)) {

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

index 44a1bc4e2708b..e70ea74bf8945 100644

index a755a12829b65..7deb3b19063e8 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -52,7 +52,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
@@ -87,7 +87,7 @@ index 44a1bc4e2708b..e70ea74bf8945 100644 
 import org.chromium.chrome.browser.lens.LensController;

 import org.chromium.chrome.browser.lens.LensEntryPoint;

 import org.chromium.chrome.browser.lens.LensIntentParams;

@@ -1372,12 +1371,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@@ -1374,12 +1373,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

                     LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);

             return false;

         }

build/e_patches/Multiple-fingerprinting-mitigations.patch

+2 −2
Original line number Diff line number Diff line 
From c500cf8afd430cacaadc4ab3126e9b6f15dd5a06 Mon Sep 17 00:00:00 2001

From f870bb9c61a0b331d1cfc912b780a984ea7bdead Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Fri, 30 Mar 2018 10:09:03 +0200

Subject: Multiple fingerprinting mitigations
@@ -700,7 +700,7 @@ index 3569ab7ee695e..41ce0df8031e6 100644 
 

   // Methods overridden by all sub-classes

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

index d0b01e9080532..a441d7582bd28 100644

index ea8a8afdbf8c8..fa5ef2a3da35f 100644

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -3467,6 +3467,12 @@