From 2a8df746422e1ffe86982b5bd649325816dd3254 Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:15:09 +0000
Subject: [PATCH] [AUTO] Patches auto-rebase
---
build/patches/Add-cromite-flags-support.patch | 2 +-
build/patches/Add-support-to-jxl.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch
index de11f71f..65f0436e 100644
--- a/build/patches/Add-cromite-flags-support.patch
+++ b/build/patches/Add-cromite-flags-support.patch
@@ -1415,7 +1415,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio
diff --git a/content/common/features.cc b/content/common/features.cc
--- a/content/common/features.cc
+++ b/content/common/features.cc
-@@ -579,4 +579,5 @@ BASE_FEATURE(kWindowOpenFileSelectFix,
+@@ -584,4 +584,5 @@ BASE_FEATURE(kScrollBubblingFix,
// Please keep features in alphabetical order.
diff --git a/build/patches/Add-support-to-jxl.patch b/build/patches/Add-support-to-jxl.patch
index 6b3d232f..e3bcd3ca 100644
--- a/build/patches/Add-support-to-jxl.patch
+++ b/build/patches/Add-support-to-jxl.patch
@@ -2648,7 +2648,7 @@ new file mode 100644
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
-@@ -20877,6 +20877,7 @@ from previous Chrome versions.
+@@ -20882,6 +20882,7 @@ from previous Chrome versions.