diff -up chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/about_flags.cc --- chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg 2022-05-19 02:16:44.000000000 +0000 +++ chromium-102.0.5005.61/chrome/browser/about_flags.cc 2022-06-03 20:09:42.298053196 +0000 @@ -4308,12 +4308,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR -#if BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) {"disable-accelerated-mjpeg-decode", flag_descriptions::kAcceleratedMjpegDecodeName, - flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, + flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, -#endif // BUILDFLAG(IS_CHROMEOS_ASH) +#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc --- chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-06-03 17:55:53.493268667 +0000 +++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc 2022-06-03 20:22:41.162906775 +0000 @@ -4029,7 +4029,7 @@ const char kUseAngleGL[] = "OpenGL"; // ChromeOS ------------------------------------------------------------------- -#if BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; @@ -4037,6 +4037,10 @@ const char kAcceleratedMjpegDecodeDescri "Enable hardware-accelerated mjpeg decode for captured frame where " "available."; +#endif + +#if BUILDFLAG(IS_CHROMEOS_ASH) + const char kAllowDisableTouchpadHapticFeedbackName[] = "Allow disabling touchpad haptic feedback"; const char kAllowDisableTouchpadHapticFeedbackDescription[] = diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.h --- chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-06-03 17:55:53.494268633 +0000 +++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.h 2022-06-03 20:23:50.514578649 +0000 @@ -2303,11 +2303,15 @@ extern const char kUseAngleGL[]; // ChromeOS ------------------------------------------------------------------- -#if BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) extern const char kAcceleratedMjpegDecodeName[]; extern const char kAcceleratedMjpegDecodeDescription[]; +#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) + +#if BUILDFLAG(IS_CHROMEOS_ASH) + extern const char kAllowDisableTouchpadHapticFeedbackName[]; extern const char kAllowDisableTouchpadHapticFeedbackDescription[];