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

Commit 75ff7b07 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '4334-master-v148' into 'master' 

Update browser to v148.0.7778.178

See merge request !130
parents 0ac64490 852d2a21

build/browser.gn_args

+0 −1
Original line number Diff line number Diff line 
android_channel="stable"

blink_symbol_level=1

build_contextual_search=false

build_with_tflite_lib=false

chrome_pgo_phase=2

dcheck_always_on=false

dfmify_dev_ui=false

cromite @ cb3baf14

Compare 79b95d83 to cb3baf14
Original line number Diff line number Diff line 
Subproject commit 79b95d83fe4e37211f5a44a524a05753ff8fed22
 
Subproject commit cb3baf14f52eb4365d017f640f85310735c19b79

build/cromite_patches_list.txt

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ Disable-Android-Tab-Declutter.patch 
Temp-disable-UseContextSnapshot.patch

add-browser-policy.patch

Keep-Side-Panel-Companion-disabled.patch

Disable-integration-with-Gemini.patch

Disable-AppRating.patch



eyeo-133.0.6943.49-base.patch

eyeo-133.0.6943.49-chrome_integration.patch

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

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

From 511cbd9ab759bd11a1a7b2d083ebd932324fb6aa 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 c2cc6088a7d1c..66ec5014a8661 100644

index 0e51c43693b72..fa5d3faf20bd6 100644

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

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

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

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

           tools:ignore="ExportedContentProvider">

       </provider>

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

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

From bedc7a4a406b697998124852e1ef8fec37ad9d2a 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 d2e78c33ea14d..f88a37ddf2a90 100644

index c645066d3e11c..a2c134f8cabf3 100644

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

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

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

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

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

       std::make_unique<component_updater::TimerUpdateScheduler>();
@@ -64,7 +64,7 @@ index d2e78c33ea14d..f88a37ddf2a90 100644 
   }

 

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

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

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

           std::move(scheduler),

           g_browser_process->subresource_filter_ruleset_service(),

           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -74,7 +74,7 @@ index d2e78c33ea14d..f88a37ddf2a90 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 3c55b8a8f75d7..982c87c838024 100644

index e10efc976d489..01506400db05b 100644

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

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

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