summaryrefslogtreecommitdiff
path: root/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc')
-rw-r--r--www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc85
1 files changed, 47 insertions, 38 deletions
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
index 28e28f4b6a23..d0fd06a31585 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2023-11-11 14:10:41 UTC
+--- chrome/browser/about_flags.cc.orig 2023-12-23 12:33:28 UTC
+++ chrome/browser/about_flags.cc
-@@ -227,7 +227,7 @@
+@@ -232,7 +232,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -327,7 +327,7 @@
+@@ -331,7 +331,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -341,7 +341,7 @@
+@@ -345,7 +345,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
@@ -27,7 +27,7 @@
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -471,7 +471,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -475,7 +475,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@@ -36,7 +36,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1563,7 +1563,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
+@@ -1464,7 +1464,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
{"ShortcutBoostSearchScore", "1414"},
{"ShortcutBoostUrlScore", "1414"}};
-@@ -5321,13 +5321,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5304,13 +5304,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -61,7 +61,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -5638,7 +5638,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5621,7 +5621,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedSportsCard)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -70,7 +70,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -6305,7 +6305,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6260,7 +6260,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -79,7 +79,7 @@
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
-@@ -7140,7 +7140,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7096,7 +7096,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@@ -88,7 +88,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
-@@ -8152,7 +8152,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8131,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -97,7 +97,16 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8845,7 +8845,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8156,7 +8156,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(
+ supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ {"enable-family-link-extensions-permissions",
+ flag_descriptions::
+ kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
+@@ -8826,7 +8826,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -106,8 +115,8 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -9149,7 +9149,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(ash::features::kWallpaperRefreshRevamp)},
+@@ -9097,7 +9097,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -115,7 +124,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -9205,7 +9205,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9139,7 +9139,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -124,7 +133,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -9769,7 +9769,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9697,7 +9697,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -133,25 +142,7 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
-@@ -10368,7 +10368,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
-
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- {"webui-system-font", flag_descriptions::kWebUiSystemFontName,
- flag_descriptions::kWebUiSystemFontDescription, kOsAll,
- FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
-@@ -10569,7 +10569,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif
-
- #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- {"data-retention-policies-disable-sync-types-needed",
- flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
- flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
-@@ -10975,7 +10975,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10804,7 +10804,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -160,12 +151,30 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
-@@ -11162,7 +11162,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll,
- FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)},
+@@ -10986,7 +10986,7 @@ const FeatureEntry kFeatureEntries[] = {
+ password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
+ #endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
+@@ -11300,7 +11300,7 @@ const FeatureEntry kFeatureEntries[] = {
+ kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kPasswordStrongLabel)},
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ {"attach-logs-to-autofill-rater-extentsion-report",
+ flag_descriptions::kAttachLogsToAutofillRaterExtensionReportName,
+ flag_descriptions::kAttachLogsToAutofillRaterExtensionReportDescription,
+@@ -11309,7 +11309,7 @@ const FeatureEntry kFeatureEntries[] = {
+ kAttachLogsToAutofillRaterExtensionReport)},
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ {"fill-multi-line", flag_descriptions::kFillMultiLineName,
+ flag_descriptions::kFillMultiLineDescription, kOsWin | kOsLinux | kOsMac,
+ FEATURE_VALUE_TYPE(compose::features::kFillMultiLine)},