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

Unverified Commit 73bd3f72 authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to 148 (#2888) 

Rebase to 148
parents 79b95d83 fa298285

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
147.0.7727.102
 
 No newline at end of file
 
148.0.7778.120
 
 No newline at end of file

build/cromite.gn_args

+2 −2
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=0

dcheck_always_on=false

disable_fieldtrial_testing_config=true
@@ -20,7 +19,6 @@ rtc_build_examples=false 
symbol_level=1

treat_warnings_as_errors=true

use_debug_fission=true

use_errorprone_java_compiler=false

use_official_google_api_keys=false

use_rtti=false

enable_arcore=false
@@ -101,6 +99,8 @@ if (target_os == "android") { 


  chrome_pgo_phase = 2 # enable pgo



  use_errorprone_java_compiler = false



  # do not split Developer UI split into a separate Dynamic Feature Module

  dfmify_dev_ui = false

build/cromite_patches_list.txt

+3 −1
Original line number Diff line number Diff line
@@ -305,6 +305,9 @@ Disable-device-bound-session.patch 
Keep-disabled-CpuPerformance.patch

Immediately-destroy-shared-workers-when-closing-the-page.patch

Disable-minikin-hyphenation.patch

Disable-integration-with-Gemini.patch

Disable-AppRating.patch

Enable-Android-DevTools-Frontend.patch



# temporary or wip patches

Temp-disable-predictive-back-gesture.patch
@@ -316,7 +319,6 @@ Block-leakage-of-urls-in-sandbox-iframes.patch 
Fix-chromium-build-bugs.patch

Try-to-fix-2082.patch

Temp-use-PREVIEW-for-IDCompositionDevice5.patch

Disable-integration-with-Gemini.patch



# adblock patches

eyeo-133.0.6943.49-base.patch

build/patches/Add-AllowUserCertificates-flag.patch

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

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

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

@@ -1134,6 +1135,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1137,6 +1138,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

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

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

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
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

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

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

             "AccountForSuppressedKeyboardInsets";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

             "AdaptiveButtonInTopToolbarCustomizationV2";
@@ -59,23 +59,23 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

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

@@ -803,6 +804,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);

@@ -836,6 +837,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidXrImmersivePlayer =

             newCachedFlag(ANDROID_XR_IMMERSIVE_PLAYER, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);

+    public static final CachedFlag sAllowUserCertificates =

+            newCachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1156,6 +1159,7 @@ public abstract class ChromeFeatureList {

@@ -1217,6 +1220,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidApb144Patch1,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationMultiDataSource,

                     sAndroidAutoMintedTwa,

                     sAndroidApb144Patch2,

                     sAndroidApb144Patch3,

                     sAndroidApb144Patch4,

diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc

new file mode 100644

--- /dev/null

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

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

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

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }