From d0c4c511181eace3afe3fae0de2ac427107603e4 Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 15 Nov 2023 13:43:18 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/Add-bookmark-import-export-actions.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 664a941d..6ded98bc 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -864,7 +864,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9826,6 +9826,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9847,6 +9847,14 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kForceOffTextAutosizing)}, #endif @@ -1382,7 +1382,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -7757,6 +7757,11 @@ const char kEnableBoundSessionCredentialsDescription[] = +@@ -7763,6 +7763,11 @@ const char kEnableBoundSessionCredentialsDescription[] = "prevent the usage of bound credentials outside of the user device."; #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -1397,7 +1397,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4493,6 +4493,9 @@ extern const char kEnableBoundSessionCredentialsName[]; +@@ -4496,6 +4496,9 @@ extern const char kEnableBoundSessionCredentialsName[]; extern const char kEnableBoundSessionCredentialsDescription[]; #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)