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

Unverified Commit 32de090d authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to v146 (#2764) 

Rebase to v146
parents d133d52d 31d4039f

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
145.0.7632.120
 
 No newline at end of file
 
146.0.7680.111
 
 No newline at end of file

build/cromite.gn_args

+0 −3
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ enable_request_header_integrity = false 
# Disable precompiled headers because they are incompatible with the unsafe_buffers configuration

enable_precompiled_headers = false



# Disable integration with Gemini

enable_glic = false



# Disable TFLite with XNNPACK

build_tflite_with_xnnpack = false

build/patches/Add-AllowUserCertificates-flag.patch

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

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

@@ -255,6 +255,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;

@@ -1118,6 +1119,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1125,6 +1126,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ 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

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

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

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,
@@ -58,8 +58,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =

@@ -795,6 +796,8 @@ public abstract class ChromeFeatureList {

     // Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by

@@ -797,6 +798,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,7 +68,7 @@ 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 =

@@ -1121,6 +1124,7 @@ public abstract class ChromeFeatureList {

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

                     // keep-sorted start

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

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

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

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

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

build/patches/Add-IsCleartextPermitted-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ new file mode 100644 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -401,6 +401,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

@@ -403,6 +403,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

       }

     }