1 files changed, 64 insertions, 63 deletions

diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index d077386236b6..9ab37bae1638 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,16 +1,38 @@
---- chrome/browser/about_flags.cc.orig	2021-09-24 04:25:57 UTC
+--- chrome/browser/about_flags.cc.orig	2021-12-31 00:57:21 UTC
 +++ chrome/browser/about_flags.cc
-@@ -195,7 +195,7 @@
- #include "ui/gl/gl_switches.h"
+@@ -204,7 +204,7 @@
  #include "ui/native_theme/native_theme_features.h"
+ #include "ui/ui_features.h"
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio
-      base::size(kMemoryVariationRemote), nullptr},
+@@ -272,10 +272,10 @@
+ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
+ #endif  // ENABLE_SUPERVISED_USERS
+ 
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+ #include "ui/ozone/buildflags.h"
+ #include "ui/ozone/public/ozone_switches.h"
+-#endif  // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH)
++#endif  // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+ 
+ #if defined(OS_WIN)
+ #include "base/win/windows_version.h"
+@@ -385,7 +385,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
+      gl::kANGLEImplementationMetalName}};
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
+     {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
+     {flag_descriptions::kOzonePlatformHintChoiceAuto,
+@@ -985,7 +985,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
+      base::size(kPageContentAnnotationsTitleParams), nullptr},
  };
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
@@ -18,7 +40,7 @@
      defined(OS_WIN)
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
-@@ -1164,7 +1164,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
+@@ -1193,7 +1193,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
      {"Dynamic Replace URL (Title - Path|URL)",
       kOmniboxBookmarkPathsDynamicReplaceUrl,
       base::size(kOmniboxBookmarkPathsDynamicReplaceUrl), nullptr}};
@@ -27,8 +49,8 @@
          // defined(OS_WIN)
  
  const FeatureEntry::FeatureVariation
-@@ -3131,7 +3131,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},
+@@ -3296,7 +3296,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
  #endif  // defined(OS_CHROMEOS)
  
 -#if defined(OS_LINUX)
@@ -36,7 +58,7 @@
      {
          "enable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3314,7 +3314,7 @@ const FeatureEntry kFeatureEntries[] = {
          kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
@@ -45,7 +67,7 @@
      {
          "disable-accelerated-video-encode",
          flag_descriptions::kAcceleratedVideoEncodeName,
-@@ -3511,7 +3511,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3685,7 +3685,7 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
       flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
       FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
@@ -54,16 +76,25 @@
      {"enable-save-data", flag_descriptions::kEnableSaveDataName,
       flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
       SINGLE_VALUE_TYPE(
-@@ -3521,7 +3521,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3695,7 +3695,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableNavigationPredictorDescription,
       kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
--#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX
-+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || OS_BSD
+-#endif  // BUILDFLAG(IS_CHROMEOS) || OS_LINUX
++#endif  // BUILDFLAG(IS_CHROMEOS) || OS_LINUX || OS_BSD
      {"enable-preconnect-to-search",
       flag_descriptions::kEnablePreconnectToSearchName,
       flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
-@@ -4326,7 +4326,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3873,7 +3873,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kWebShare)},
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_WIN || OS_MAC
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
+      flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
+      MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
+@@ -4567,7 +4567,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsAll,
       FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
  
@@ -72,7 +103,7 @@
      defined(OS_WIN)
      {"omnibox-experimental-keyword-mode",
       flag_descriptions::kOmniboxExperimentalKeywordModeName,
-@@ -4438,7 +4438,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4676,7 +4676,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOmniboxPreserveLongerShortcutsTextName,
       flag_descriptions::kOmniboxPreserveLongerShortcutsTextDescription,
       kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kPreserveLongerShortcutsText)},
@@ -81,7 +112,7 @@
          // defined(OS_WIN)
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -4707,12 +4707,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4952,12 +4952,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
  #endif  // !defined(OS_ANDROID)
  
@@ -96,7 +127,7 @@
          // defined(OS_CHROMEOS)
  
  #if !defined(OS_ANDROID)
-@@ -5322,7 +5322,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5577,7 +5577,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSharingSendViaSyncDescription, kOsAll,
       FEATURE_VALUE_TYPE(kSharingSendViaSync)},
  
@@ -105,7 +136,7 @@
      {"sharing-hub-desktop-app-menu",
       flag_descriptions::kSharingHubDesktopAppMenuName,
       flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop,
-@@ -5331,7 +5331,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5586,7 +5586,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSharingHubDesktopOmniboxName,
       flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)},
@@ -114,26 +145,25 @@
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
      {"ash-enable-pip-rounded-corners",
-@@ -5805,7 +5805,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6011,14 +6011,14 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
-     {"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
-      flag_descriptions::kGlobalMediaControlsDescription,
-@@ -5846,7 +5846,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kGlobalMediaControlsOverlayControlsDescription,
-      kOsWin | kOsMac | kOsLinux,
-      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)},
+     {"global-media-controls-modern-ui",
+      flag_descriptions::kGlobalMediaControlsModernUIName,
+      flag_descriptions::kGlobalMediaControlsModernUIDescription,
+      kOsWin | kOsMac | kOsLinux | kOsCrOS,
+      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsModernUI)},
 -#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
 +#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS)
  
      {"safety-tips", flag_descriptions::kSafetyTipName,
-@@ -6648,7 +6648,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kIncognitoReauthenticationForAndroid)},
+@@ -6734,7 +6734,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(chrome::android::kIncognitoReauthenticationForAndroid)},
  #endif
  
 -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
@@ -141,7 +171,7 @@
      defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
      {"incognito-brand-consistency-for-desktop",
       flag_descriptions::kIncognitoBrandConsistencyForDesktopName,
-@@ -6667,7 +6667,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6753,7 +6753,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kInheritNativeThemeFromParentWidgetDescription,
       kOsDesktop,
       FEATURE_VALUE_TYPE(views::features::kInheritNativeThemeFromParentWidget)},
@@ -149,8 +179,8 @@
 +#endif  // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
  
-     {"content-settings-redesign",
-@@ -6778,7 +6778,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"consolidated-site-storage-controls",
+@@ -6867,7 +6867,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(language::kForceAppLanguagePrompt)},
  #endif
  
@@ -159,36 +189,16 @@
      {"commander", flag_descriptions::kCommanderName,
       flag_descriptions::kCommanderDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kCommander)},
-@@ -6805,8 +6805,8 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll,
-      FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)},
- 
--#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
--     defined(OS_CHROMEOS)) &&                                   \
-+#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
-+     defined(OS_CHROMEOS)) &&                                                      \
-     BUILDFLAG(ENABLE_PRINTING)
-     {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
-      flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
-@@ -7091,7 +7091,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(media::kVaapiVp9kSVCHWEncoding)},
- #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -7121,7 +7121,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kVp9kSVCHWDecodingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(media::kVp9kSVCHWDecoding)},
  
 -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
 +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
      defined(OS_MAC)
      {
          "ui-debug-tools",
-@@ -7181,7 +7181,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)},
- #endif
- 
--#if defined(OS_LINUX) && defined(USE_OZONE)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
-     {"use-ozone-platform", flag_descriptions::kUseOzonePlatformName,
-      flag_descriptions::kUseOzonePlatformDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kUseOzonePlatform)},
-@@ -7224,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7259,7 +7259,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chromeos::features::kLauncherAppSort)},
  #endif
  
@@ -197,12 +207,3 @@
      {"enable-desktop-pwas-app-icon-shortcuts-menu-ui",
       flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName,
       flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription,
-@@ -7487,7 +7487,7 @@ const FeatureEntry kFeatureEntries[] = {
-          ash::features::kHoldingSpaceInProgressDownloadsIntegration)},
- #endif
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
-     defined(OS_MAC) || (defined(OS_ANDROID))
-     {"omnibox-updated-connection-security-indicators",
-      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,