sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
846 changed files with 10693 additions and 8131 deletions
|
@ -1,7 +1,7 @@
|
|||
Index: chrome/browser/flag_descriptions.cc
|
||||
--- chrome/browser/flag_descriptions.cc.orig
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -2515,7 +2515,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
|
||||
@@ -2556,7 +2556,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
|
||||
const char kWebUIOmniboxPopupDescription[] =
|
||||
"If enabled, shows the omnibox suggestions popup in WebUI.";
|
||||
|
||||
|
@ -10,16 +10,16 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kWebUiSystemFontName[] = "WebUI System font";
|
||||
const char kWebUiSystemFontDescription[] =
|
||||
"If enabled, all WebUI surfaces will use the default UI font of the "
|
||||
@@ -6835,7 +6835,7 @@ const char kLibAssistantV2MigrationDescription[] =
|
||||
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -7040,7 +7040,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
|
||||
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
|
||||
const char kGetAllScreensMediaDescription[] =
|
||||
"When enabled, the getAllScreensMedia API for capturing multiple screens "
|
||||
@@ -7075,7 +7075,7 @@ const char kSearchWebInSidePanelDescription[] =
|
||||
@@ -7254,7 +7254,7 @@ const char kSearchWebInSidePanelDescription[] =
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kQuickCommandsName[] = "Quick Commands";
|
||||
const char kQuickCommandsDescription[] =
|
||||
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
|
||||
@@ -7084,7 +7084,7 @@ const char kQuickCommandsDescription[] =
|
||||
@@ -7263,7 +7263,7 @@ const char kQuickCommandsDescription[] =
|
||||
// BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -37,16 +37,16 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
|
||||
const char kFollowingFeedSidepanelDescription[] =
|
||||
"Enables the following feed in the sidepanel.";
|
||||
@@ -7106,7 +7106,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
|
||||
@@ -7278,7 +7278,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
|
||||
"instead of JSON.";
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
const char kUseOutOfProcessVideoDecodingName[] =
|
||||
"Use out-of-process video decoding (OOP-VD)";
|
||||
const char kUseOutOfProcessVideoDecodingDescription[] =
|
||||
@@ -7124,7 +7124,7 @@ const char kWebShareDescription[] =
|
||||
const char kEnableNetworkServiceSandboxName[] =
|
||||
"Enable the network service sandbox.";
|
||||
const char kEnableNetworkServiceSandboxDescription[] =
|
||||
@@ -7302,7 +7302,7 @@ const char kWebShareDescription[] =
|
||||
"platforms.";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
||||
|
||||
|
@ -55,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kOzonePlatformHintChoiceDefault[] = "Default";
|
||||
const char kOzonePlatformHintChoiceAuto[] = "Auto";
|
||||
const char kOzonePlatformHintChoiceX11[] = "X11";
|
||||
@@ -7144,7 +7144,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
@@ -7322,7 +7322,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
"Bluetooth";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
|
@ -64,7 +64,7 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kSkipUndecryptablePasswordsName[] =
|
||||
"Skip undecryptable passwords to use the available decryptable "
|
||||
"passwords.";
|
||||
@@ -7158,7 +7158,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
|
||||
@@ -7336,7 +7336,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
|
||||
"storage and requests initial sync.";
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
|
@ -73,7 +73,7 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kAsyncDnsName[] = "Async DNS resolver";
|
||||
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
@@ -7259,7 +7259,7 @@ const char kElasticOverscrollDescription[] =
|
||||
@@ -7443,7 +7443,7 @@ const char kElasticOverscrollDescription[] =
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
@ -82,7 +82,7 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kUIDebugToolsName[] = "Debugging tools for UI";
|
||||
const char kUIDebugToolsDescription[] =
|
||||
"Enables additional keyboard shortcuts to help debugging.";
|
||||
@@ -7288,7 +7288,7 @@ const char kSigninInterceptBubbleV2Description[] =
|
||||
@@ -7455,7 +7455,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
|
||||
|
@ -91,3 +91,12 @@ Index: chrome/browser/flag_descriptions.cc
|
|||
const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
|
||||
"Data Retention Policies Disable Sync Types";
|
||||
const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
|
||||
@@ -7500,7 +7500,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
|
||||
"any one time. Requires #enable-media-session-service to be enabled too.";
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
const char kThirdPartyProfileManagementName[] =
|
||||
"Third party profile management";
|
||||
const char kThirdPartyProfileManagementDescription[] =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue