119 lines
5.6 KiB
C++
119 lines
5.6 KiB
C++
--- chrome/browser/about_flags.cc.orig 2022-04-21 18:48:31 UTC
|
|
+++ chrome/browser/about_flags.cc
|
|
@@ -205,7 +205,7 @@
|
|
#include "ui/native_theme/native_theme_features.h"
|
|
#include "ui/ui_features.h"
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#include "base/allocator/buildflags.h"
|
|
#endif
|
|
|
|
@@ -277,7 +277,7 @@
|
|
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
|
|
#endif // ENABLE_SUPERVISED_USERS
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
|
#include "ui/ozone/buildflags.h"
|
|
#include "ui/ozone/public/ozone_switches.h"
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
|
|
@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
|
|
gl::kANGLEImplementationMetalName}};
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
|
|
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
|
|
{flag_descriptions::kOzonePlatformHintChoiceAuto,
|
|
@@ -1047,7 +1047,7 @@ const FeatureEntry::FeatureVariation kJourneysOnDevice
|
|
};
|
|
|
|
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
|
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
|
|
{"DocumentUseServerScore", "true"},
|
|
{"DocumentUseClientScore", "false"},
|
|
@@ -3520,7 +3520,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
{
|
|
"enable-accelerated-video-decode",
|
|
flag_descriptions::kAcceleratedVideoDecodeName,
|
|
@@ -3938,7 +3938,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
{"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
|
|
flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
|
|
FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
|
|
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
{"enable-navigation-predictor",
|
|
flag_descriptions::kEnableNavigationPredictorName,
|
|
flag_descriptions::kEnableNavigationPredictorDescription,
|
|
@@ -4138,7 +4138,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
FEATURE_VALUE_TYPE(features::kWebShare)},
|
|
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
|
|
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
|
|
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
|
|
@@ -4157,7 +4157,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
{"skip-undecryptable-passwords",
|
|
flag_descriptions::kSkipUndecryptablePasswordsName,
|
|
flag_descriptions::kSkipUndecryptablePasswordsDescription,
|
|
@@ -4886,7 +4886,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
"OmniboxBundledExperimentV1")},
|
|
|
|
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
|
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
{"omnibox-experimental-keyword-mode",
|
|
flag_descriptions::kOmniboxExperimentalKeywordModeName,
|
|
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
|
|
@@ -5299,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
{"webui-feedback", flag_descriptions::kWebuiFeedbackName,
|
|
flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
|
|
FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
|
|
@@ -6363,7 +6363,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
{"global-media-controls-modern-ui",
|
|
flag_descriptions::kGlobalMediaControlsModernUIName,
|
|
flag_descriptions::kGlobalMediaControlsModernUIDescription,
|
|
@@ -7230,7 +7230,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
- BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
{"quick-commands", flag_descriptions::kQuickCommandsName,
|
|
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
|
|
FEATURE_VALUE_TYPE(features::kQuickCommands)},
|
|
@@ -7536,7 +7536,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
|
|
#if BUILDFLAG(IS_WIN) || \
|
|
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
|
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
{
|
|
"ui-debug-tools",
|
|
flag_descriptions::kUIDebugToolsName,
|