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

Unverified Commit 7385aef7 authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for master branch (#1504) 

[AUTO] Patches auto-rebase for master branch
parents 59c0db74 fed11ff8

build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc

--- a/content/browser/renderer_host/render_frame_host_impl.cc

+++ b/content/browser/renderer_host/render_frame_host_impl.cc

@@ -4505,7 +4505,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(

@@ -4495,7 +4495,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(

 }

 

 void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {

build/patches/Cromite-Branding--improve-settings-ui.patch

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja 
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

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

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

@@ -7,7 +7,7 @@

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

         android:key="sync_promo"

         android:order="0"/>

     <PreferenceCategory
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j 
         android:order="1001"

         android:title="@string/prefs_section_account_and_google_services"/>

     <org.chromium.chrome.browser.sync.settings.SignInPreference

@@ -20,7 +20,7 @@

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

         android:layout="@layout/account_management_account_row"

         android:title="@string/sync_category_title"/>

     <org.chromium.components.browser_ui.settings.ChromeBasePreference