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

Unverified Commit 5dfab50b authored by uazo's avatar uazo Committed by GitHub
Browse files

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

[AUTO] Patches auto-rebase for master branch
parents 61efde8e f4aa1902

build/patches/Add-AllowUserCertificates-flag.patch

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -232,6 +232,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

@@ -233,6 +233,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -1053,6 +1054,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1054,6 +1055,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());

         ChromeCachedFlags.getInstance().cacheNativeFlags();

build/patches/Add-an-always-incognito-mode.patch

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;

 import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;

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

@@ -2041,6 +2042,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -2044,6 +2045,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

             throw new IllegalStateException(

                     "Attempting to access TabCreator before initialization");

         }

build/patches/Add-exit-menu-item.patch

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.chrome.browser.ChromeActivitySessionTracker;

 import org.chromium.chrome.browser.ChromeApplicationImpl;

 import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;

@@ -2563,6 +2564,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -2566,6 +2567,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

             return true;

         }

build/patches/Add-menu-item-to-view-source.patch

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -2720,6 +2720,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -2723,6 +2723,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

             return doOpenWebApk(currentTab);

         }

build/patches/Add-option-to-disable-snapshots.patch

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -144,6 +144,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

@@ -145,6 +145,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;

 import org.chromium.chrome.browser.preferences.Pref;

 import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.chrome.browser.profiles.Profile;

 import org.chromium.chrome.browser.profiles.ProfileManager;

 import org.chromium.chrome.browser.profiles.ProfileProvider;

@@ -724,7 +725,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -725,7 +726,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

                     new TabContentManager(

                             this,

                             mBrowserControlsManagerSupplier.get(),