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

Unverified Commit 9e9b0660 authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to 143 (#2522) 

Rebase to 143
parents 97d638e4 2e7927fa

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
142.0.7444.176
 
 No newline at end of file
 
143.0.7499.40
 
 No newline at end of file

build/cromite_patches_list.txt

+1 −2
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ Disable-Posture-API.patch 
PublicKeyCredential-fingerprinting-mitigations.patch

Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch

Enable-Cert-Management-UI.patch

Enable-ProcessBoundStringEncryption-by-default.patch

Prevent-mouse-wheel-fingerprinting-on-Windows.patch

Enable-component-updater.patch

Android-fonts-fingerprinting-mitigation.patch
@@ -331,5 +330,5 @@ Eyeo-Adblock-for-Cromite.patch 


# extension patches

Experimental-support-for-extensions-on-Android.patch

Backport-v143-android-extensions-changes.patch

Backport-v144-android-extensions-changes.patch

Enable-extension-in-incognito.patch

build/patches/Add-AllowUserCertificates-flag.patch

+10 −10
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

@@ -242,6 +242,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

@@ -249,6 +249,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

 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;

@@ -1004,6 +1005,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1082,6 +1083,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,26 +40,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -185,6 +185,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -194,6 +194,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

+    &kAllowUserCertificates,

     &feed::kFeedRecyclerBinderUnmountOnDetach,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kInterestFeedV2,

     &feed::kWebFeedAwareness,

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

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -164,6 +164,7 @@ public abstract class ChromeFeatureList {

@@ -166,6 +166,7 @@ public abstract class ChromeFeatureList {

             "AccountForSuppressedKeyboardInsets";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

             "AdaptiveButtonInTopToolbarCustomizationV2";

+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -807,6 +808,8 @@ public abstract class ChromeFeatureList {

     public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =

@@ -805,6 +806,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,8 +68,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1130,6 +1133,7 @@ public abstract class ChromeFeatureList {

                     sAllowTabClosingUponMinimization,

@@ -1128,6 +1131,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

+                    sAllowUserCertificates,

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,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/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

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

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

@@ -883,6 +883,12 @@ public class KeyboardShortcuts {

@@ -903,6 +903,12 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/base/features.cc b/base/features.cc

--- a/base/features.cc

+++ b/base/features.cc

@@ -188,6 +188,10 @@ bool IsReducePPMsEnabled() {

@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() {

   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);

 }