diff --git a/build/patches/00Client-hints-overrides--add-fixup-.patch b/build/patches/00Client-hints-overrides--add-fixup-.patch deleted file mode 100644 index 66bde131..00000000 --- a/build/patches/00Client-hints-overrides--add-fixup-.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Your Name -Date: Mon, 7 Nov 2022 16:49:08 +0000 -Subject: Client hints overrides (add fixup) - ---- - components/optimization_guide/core/hints_manager.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc ---- a/components/optimization_guide/core/hints_manager.cc -+++ b/components/optimization_guide/core/hints_manager.cc -@@ -1057,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand( - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - // TODO(crbug/1275612): Check whether we have consent to fetch. -+ if ((true)) return; // no consent on bromite - - // This set contains URLs that require some information to be fetched, whether - // that be a URL-keyed hint or a host-keyed hint. --- -2.25.1 diff --git a/build/patches/00Eyeo-Adblock.patch b/build/patches/00Eyeo-Adblock.patch index dabad59e..d94f2a20 100644 --- a/build/patches/00Eyeo-Adblock.patch +++ b/build/patches/00Eyeo-Adblock.patch @@ -161520,7 +161520,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums --> +@@ -33998,6 +34001,12 @@ Called by update_extension_histograms.py.--> @@ -161533,7 +161533,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -35802,6 +35811,31 @@ Called by update_extension_histograms.py.--> +@@ -35805,6 +35814,31 @@ Called by update_extension_histograms.py.--> @@ -161565,7 +161565,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -36436,6 +36470,7 @@ Called by update_extension_permission.py.--> +@@ -36439,6 +36473,7 @@ Called by update_extension_permission.py.--> @@ -161573,7 +161573,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -97869,6 +97904,8 @@ Full version information for the fingerprint enum values: +@@ -97872,6 +97907,8 @@ Full version information for the fingerprint enum values: diff --git a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch b/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch deleted file mode 100644 index 462157fd..00000000 --- a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Your Name -Date: Mon, 7 Nov 2022 16:09:55 +0000 -Subject: Move navigation bar to bottom (add fixup) - ---- - .../browser/ui/system/StatusBarColorController.java | 9 +++++++++ - .../org/chromium/chrome/browser/ui/appmenu/AppMenu.java | 5 +++++ - 2 files changed, 14 insertions(+) - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java -@@ -13,6 +13,9 @@ import android.view.Window; - import androidx.annotation.ColorInt; - import androidx.annotation.Nullable; - -+import org.chromium.chrome.browser.flags.ChromeFeatureList; -+import org.chromium.chrome.browser.flags.CachedFeatureFlags; -+ - import org.chromium.base.ApiCompatibilityUtils; - import org.chromium.base.CallbackController; - import org.chromium.base.supplier.ObservableSupplier; -@@ -370,6 +373,12 @@ public class StatusBarColorController - boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color); - ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); - ApiCompatibilityUtils.setStatusBarColor(mWindow, color); -+ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) && -+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { -+ UiUtils.setNavigationBarIconColor(mWindow.getDecorView().getRootView(), -+ needsDarkStatusBarIcons); -+ mWindow.setNavigationBarColor(color); -+ } - } - - /** -diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java ---- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -310,6 +310,11 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler - if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) { - mPopup.setHeight(visibleDisplayFrame.height()); - } -+ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) { -+ // due to some unknown behaviour, the popup must be resized to -+ // allow selection without leaving touch -+ mPopup.setHeight(popupHeight-1); -+ } - - try { - mPopup.showAtLocation(anchorView.getRootView(), Gravity.NO_GRAVITY, popupPosition[0], --- -2.25.1