update to 149.0.7827.155

This commit is contained in:
robert
2026-06-17 07:29:44 +00:00
parent 392f611de0
commit 9aaeee20a8
19 changed files with 100 additions and 100 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ DPB_PROPERTIES+= lonesome
COMMENT= Chromium browser
V= 149.0.7827.114
V= 149.0.7827.155
DISTNAME= chromium-${V}
+4 -4
View File
@@ -164,8 +164,8 @@ SHA256 (cargo/wyz-0.5.1.tar.gz) = BfNg/AskKWMpx4/ahSoemugt6c97J9rkt/YvEY93ue0=
SHA256 (cargo/xxhash-rust-0.8.12.tar.gz) = aly/dQQAlYgZ+2F46qg77lzZwpompAzCQd+McP3UaYQ=
SHA256 (cargo/zerocopy-0.7.35.tar.gz) = G5tP0Yq8grgTaDjaXVC6573qU3xXTY3Bo07QmNbBZvA=
SHA256 (cargo/zerocopy-derive-0.7.35.tar.gz) = +k+AgDRNRnH7ToMaE60eaAknSDh9/E9V41YkL64Szj4=
SHA256 (chromium-149.0.7827.114-lite.tar.xz) = bTGZVEfRtQXOAHzqZ9X2bRBxDhZgocME0K5cVK7KTv8=
SHA256 (chromium-149.0.7827.114-testdata.tar.xz) = m9nXLtYr2IuE/kLbISo+MRYOqa8NmlmaRMrITGCyuHg=
SHA256 (chromium-149.0.7827.155-lite.tar.xz) = Tjn9CuOtZP1L/2pSPZT+XikXrVGn9GpzyEpXNtndqGI=
SHA256 (chromium-149.0.7827.155-testdata.tar.xz) = JmoNR6JYrfW1ZMtqGZEoOXMPZ2ZXOfozRIXDES3xB9Y=
SHA256 (rollup-rollup-v4.22.4.tar.gz) = p+XAnwD+UK2r4n/vhFVRDxVs9z/uiu8frzgEtlOYjkw=
SHA256 (test_fonts-a28b222b79851716f8358d2800157d9ffe117b3545031ae51f69b7e1e1b9a969.tar.gz) = oosiK3mFFxb4NY0oABV9n/4RezVFAxrlH2m34eG5qWk=
SIZE (cargo/Inflector-0.11.4.tar.gz) = 17438
@@ -334,7 +334,7 @@ SIZE (cargo/wyz-0.5.1.tar.gz) = 18790
SIZE (cargo/xxhash-rust-0.8.12.tar.gz) = 21329
SIZE (cargo/zerocopy-0.7.35.tar.gz) = 152645
SIZE (cargo/zerocopy-derive-0.7.35.tar.gz) = 37829
SIZE (chromium-149.0.7827.114-lite.tar.xz) = 1610476084
SIZE (chromium-149.0.7827.114-testdata.tar.xz) = 1314860504
SIZE (chromium-149.0.7827.155-lite.tar.xz) = 1610093724
SIZE (chromium-149.0.7827.155-testdata.tar.xz) = 1314813100
SIZE (rollup-rollup-v4.22.4.tar.gz) = 1732642
SIZE (test_fonts-a28b222b79851716f8358d2800157d9ffe117b3545031ae51f69b7e1e1b9a969.tar.gz) = 33233004
@@ -1,7 +1,7 @@
Index: base/files/file_util_posix.cc
--- base/files/file_util_posix.cc.orig
+++ base/files/file_util_posix.cc
@@ -936,6 +936,7 @@ bool CreateNewTempDirectory(FilePath::StringViewType p
@@ -938,6 +938,7 @@ bool CreateNewTempDirectory(FilePath::StringViewType p
bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
@@ -9,7 +9,7 @@ Index: base/files/file_util_posix.cc
// Avoid checking subdirs if directory already exists.
if (DirectoryExists(full_path)) {
@@ -945,8 +946,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -947,8 +948,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
// Collect a list of all missing directories.
std::vector<FilePath> missing_subpaths({full_path});
FilePath last_path = full_path;
@@ -20,7 +20,7 @@ Index: base/files/file_util_posix.cc
if (DirectoryExists(path)) {
break;
}
@@ -964,21 +965,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -966,21 +967,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
}
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -95,7 +95,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
{"BackoffTime", "0h"},
{"BackoffMultiplierBase", "0.0"},
@@ -4245,7 +4262,7 @@ const FeatureEntry::FeatureVariation
@@ -4255,7 +4272,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -104,7 +104,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kNtpCustomizeChromeAutoOpenOnEveryNTP[] = {
{"max_customize_chrome_auto_shown_count", "5"},
{"max_customize_chrome_auto_shown_session_count", "5"}};
@@ -4323,7 +4340,7 @@ const FeatureEntry::FeatureVariation
@@ -4333,7 +4350,7 @@ const FeatureEntry::FeatureVariation
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -113,7 +113,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kProjectsPanelWithoutThreadsVariation[] = {
{"include_threads_in_projects_panel", "false"}};
const FeatureEntry::FeatureParam kProjectsPanelWithThreadsVariation[] = {
@@ -4359,7 +4376,7 @@ const FeatureEntry::FeatureVariation kSeamlessSigninVa
@@ -4369,7 +4386,7 @@ const FeatureEntry::FeatureVariation kSeamlessSigninVa
kSeamlessSigninCompactSignin, nullptr}};
#endif // BUILDFLAG(IS_ANDROID)
@@ -122,7 +122,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kProfilePickerTextVariation1[] = {
{"profile-picker-variation", "keep-work-and-life-separate"}};
const FeatureEntry::FeatureParam kProfilePickerTextVariation2[] = {
@@ -5508,7 +5525,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5518,7 +5535,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableProcessIsolationUiDescription, kOsWin,
FEATURE_VALUE_TYPE(features::kProcessIsolationSettings)},
#endif // BUILDFLAG(IS_WIN)
@@ -131,7 +131,7 @@ Index: chrome/browser/about_flags.cc
{"enable-iwa-key-distribution-component",
flag_descriptions::kEnableIwaKeyDistributionComponentName,
flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
@@ -5701,7 +5718,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5716,7 +5733,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kUseSCContentSharingPicker)},
#endif // BUILDFLAG(IS_MAC)
@@ -140,7 +140,7 @@ Index: chrome/browser/about_flags.cc
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5716,6 +5733,16 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5731,6 +5748,16 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWaylandSessionManagementName,
flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
@@ -157,7 +157,7 @@ Index: chrome/browser/about_flags.cc
#endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(ENABLE_VR)
@@ -6163,7 +6190,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6178,7 +6205,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kFillOnAccountSelectDescription, kOsAll,
FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)},
@@ -166,7 +166,7 @@ Index: chrome/browser/about_flags.cc
{"first-run-desktop-choice-screen-refresh",
flag_descriptions::kFirstRunDesktopChoiceScreenRefreshName,
flag_descriptions::kFirstRunDesktopChoiceScreenRefreshDescription,
@@ -6483,7 +6510,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6498,7 +6525,7 @@ const FeatureEntry kFeatureEntries[] = {
"MlUrlScoring")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -175,7 +175,7 @@ Index: chrome/browser/about_flags.cc
{"contextual-search-box-uses-contextual-search-provider",
flag_descriptions::kContextualSearchBoxUsesContextualSearchProviderName,
flag_descriptions::
@@ -6910,7 +6937,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6925,7 +6952,7 @@ const FeatureEntry kFeatureEntries[] = {
kVoiceSearchCoherenceComposeboxVariations,
"VoiceSearchCoherenceComposeboxVariations")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -184,7 +184,7 @@ Index: chrome/browser/about_flags.cc
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(history_embeddings::kHistoryEmbeddings)},
@@ -7104,7 +7131,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7119,7 +7146,7 @@ const FeatureEntry kFeatureEntries[] = {
"NtpRealboxNext")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -193,7 +193,7 @@ Index: chrome/browser/about_flags.cc
{"ntp-customize-chrome-auto-open",
flag_descriptions::kNtpCustomizeChromeAutoOpenName,
flag_descriptions::kNtpCustomizeChromeAutoOpenDescription, kOsDesktop,
@@ -7347,7 +7374,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7362,7 +7389,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_PRINTING)
@@ -202,7 +202,7 @@ Index: chrome/browser/about_flags.cc
{"cups-ipp-printing-backend",
flag_descriptions::kCupsIppPrintingBackendName,
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
@@ -7572,7 +7599,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7587,7 +7614,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -211,7 +211,7 @@ Index: chrome/browser/about_flags.cc
{"enable-input-protection", flag_descriptions::kEnableInputProtectionName,
flag_descriptions::kEnableInputProtectionDescription, kOsDesktop,
FEATURE_VALUE_TYPE(views::features::kEnableInputProtection)},
@@ -8169,7 +8196,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8184,7 +8211,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kGesturePropertiesDBusService)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -220,7 +220,7 @@ Index: chrome/browser/about_flags.cc
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8636,7 +8663,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8651,7 +8678,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
@@ -229,7 +229,7 @@ Index: chrome/browser/about_flags.cc
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9082,7 +9109,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9097,7 +9124,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -238,7 +238,7 @@ Index: chrome/browser/about_flags.cc
{"auto-picture-in-picture-for-video-playback",
flag_descriptions::kAutoPictureInPictureForVideoPlaybackName,
flag_descriptions::kAutoPictureInPictureForVideoPlaybackDescription,
@@ -9271,7 +9298,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9286,7 +9313,7 @@ const FeatureEntry kFeatureEntries[] = {
kIsolateSandboxedIframesGroupingVariations,
"IsolateSandboxedIframes" /* trial name */)},
@@ -247,7 +247,7 @@ Index: chrome/browser/about_flags.cc
{"reduce-user-agent-data-linux-platform-version",
flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionName,
flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionDescription,
@@ -9304,7 +9331,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9319,7 +9346,7 @@ const FeatureEntry kFeatureEntries[] = {
content_settings::features::kApproximateGeolocationPermission,
kApproximateGeolocationPermissionVariations,
"ApproximateGeolocationPermission")},
@@ -256,7 +256,7 @@ Index: chrome/browser/about_flags.cc
{"approximate-geolocation-permission",
flag_descriptions::kApproximateGeolocationPermissionName,
flag_descriptions::kApproximateGeolocationPermissionDescription,
@@ -9794,7 +9821,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9809,7 +9836,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kRcapsDynamicProfileCountryDescription, kOsAll,
FEATURE_VALUE_TYPE(switches::kDynamicProfileCountry)},
@@ -265,7 +265,7 @@ Index: chrome/browser/about_flags.cc
{"enable-generic-oidc-auth-profile-management",
flag_descriptions::kEnableGenericOidcAuthProfileManagementName,
flag_descriptions::kEnableGenericOidcAuthProfileManagementDescription,
@@ -9804,7 +9831,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9819,7 +9846,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -274,7 +274,7 @@ Index: chrome/browser/about_flags.cc
{"enable-user-navigation-capturing-pwa",
flag_descriptions::kPwaNavigationCapturingName,
flag_descriptions::kPwaNavigationCapturingDescription,
@@ -10174,7 +10201,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10189,7 +10216,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kResponsiveIframesDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kResponsiveIframes)},
@@ -283,7 +283,7 @@ Index: chrome/browser/about_flags.cc
{"replace-sync-promos-with-sign-in-promos-desktop",
flag_descriptions::kReplaceSyncPromosWithSignInPromosName,
flag_descriptions::kReplaceSyncPromosWithSignInPromosDescription,
@@ -10574,7 +10601,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10589,7 +10616,7 @@ const FeatureEntry kFeatureEntries[] = {
segmentation_platform::features::kSegmentationSurveyPage)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -292,7 +292,7 @@ Index: chrome/browser/about_flags.cc
{"autofill-enable-buy-now-pay-later",
flag_descriptions::kAutofillEnableBuyNowPayLaterName,
flag_descriptions::kAutofillEnableBuyNowPayLaterDescription,
@@ -11022,7 +11049,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11042,7 +11069,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
#endif // !BUILDFLAG(IS_ANDROID)
@@ -301,7 +301,7 @@ Index: chrome/browser/about_flags.cc
{"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
@@ -11045,7 +11072,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11065,7 +11092,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -310,7 +310,7 @@ Index: chrome/browser/about_flags.cc
{"autofill-enable-amount-extraction",
flag_descriptions::kAutofillEnableAmountExtractionName,
flag_descriptions::kAutofillEnableAmountExtractionDescription,
@@ -11195,7 +11222,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11215,7 +11242,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
feature_engagement::kIPHAutofillCreditCardBenefitFeature)},
@@ -319,7 +319,7 @@ Index: chrome/browser/about_flags.cc
{"chrome-web-store-navigation-throttle",
flag_descriptions::kChromeWebStoreNavigationThrottleName,
flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
@@ -11240,7 +11267,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11260,7 +11287,7 @@ const FeatureEntry kFeatureEntries[] = {
supervised_user::kSupervisedUserUseUrlFilteringService)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -328,7 +328,7 @@ Index: chrome/browser/about_flags.cc
{"autofill-enable-amount-extraction-testing",
flag_descriptions::kAutofillEnableAmountExtractionTestingName,
flag_descriptions::kAutofillEnableAmountExtractionTestingDescription,
@@ -11250,7 +11277,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11270,7 +11297,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -337,7 +337,7 @@ Index: chrome/browser/about_flags.cc
{"root-scrollbar-follows-browser-theme",
flag_descriptions::kRootScrollbarFollowsTheme,
flag_descriptions::kRootScrollbarFollowsThemeDescription,
@@ -11481,7 +11508,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11501,7 +11528,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -346,7 +346,7 @@ Index: chrome/browser/about_flags.cc
{"tab-group-home", tabs::flag_descriptions::kTabGroupHomeName,
tabs::flag_descriptions::kTabGroupHomeDescription, kOsDesktop,
FEATURE_VALUE_TYPE(tabs::kTabGroupHome)},
@@ -11530,7 +11557,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11550,7 +11577,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -355,7 +355,7 @@ Index: chrome/browser/about_flags.cc
{"enable-site-search-allow-user-override-policy",
flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyName,
flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyDescription,
@@ -11621,7 +11648,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11641,7 +11668,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -364,7 +364,7 @@ Index: chrome/browser/about_flags.cc
{"autofill-enable-buy-now-pay-later-for-klarna",
flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaName,
flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaDescription,
@@ -11670,7 +11697,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11690,7 +11717,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -373,7 +373,7 @@ Index: chrome/browser/about_flags.cc
{"autofill-enable-buy-now-pay-later-for-externally-linked",
flag_descriptions::kAutofillEnableBuyNowPayLaterForExternallyLinkedName,
flag_descriptions::
@@ -12075,7 +12102,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12095,7 +12122,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -382,7 +382,7 @@ Index: chrome/browser/about_flags.cc
{"contextual-suggestion-ui-improvements",
flag_descriptions::kContextualSuggestionsUiImprovementsName,
flag_descriptions::kContextualSuggestionsUiImprovementsDescription,
@@ -12183,7 +12210,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12203,7 +12230,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kCryptographyComplianceCnsa)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -391,7 +391,7 @@ Index: chrome/browser/about_flags.cc
{"lens-reinvocation-affordance",
flag_descriptions::kLensSearchReinvocationAffordanceName,
flag_descriptions::kLensSearchReinvocationAffordanceDescription,
@@ -12228,7 +12255,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12248,7 +12275,7 @@ const FeatureEntry kFeatureEntries[] = {
STRING_VALUE_TYPE(variations::switches::kVariationsSeedCorpus, "")},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -400,7 +400,7 @@ Index: chrome/browser/about_flags.cc
{"passkey-unlock-manager", flag_descriptions::kPasskeyUnlockManagerName,
flag_descriptions::kPasskeyUnlockManagerDescription, kOsDesktop,
FEATURE_VALUE_TYPE(device::kPasskeyUnlockManager)},
@@ -12273,7 +12300,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12293,7 +12320,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kHandleMdmErrorsForDasherAccountsDescription, kOsAll,
FEATURE_VALUE_TYPE(switches::kHandleMdmErrorsForDasherAccounts)},
@@ -409,7 +409,7 @@ Index: chrome/browser/about_flags.cc
{"disable-u18-feedback-desktop",
flag_descriptions::kDisableU18FeedbackDesktopName,
flag_descriptions::kDisableU18FeedbackDesktopDescription,
@@ -12281,7 +12308,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12301,7 +12328,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(switches::kDisableU18FeedbackDesktop)},
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -418,7 +418,7 @@ Index: chrome/browser/about_flags.cc
{"profile-creation-decline-signin-cta-experiment",
flag_descriptions::kProfileCreationDeclineSigninCTAExperimentName,
flag_descriptions::kProfileCreationDeclineSigninCTAExperimentDescription,
@@ -12295,7 +12322,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12315,7 +12342,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(switches::kSearchSettingsUpdate)},
#endif
@@ -427,7 +427,7 @@ Index: chrome/browser/about_flags.cc
{"show-profile-picker-to-all-users-experiment",
flag_descriptions::kShowProfilePickerToAllUsersExperimentName,
flag_descriptions::kShowProfilePickerToAllUsersExperimentDescription,
@@ -12310,7 +12337,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12330,7 +12357,7 @@ const FeatureEntry kFeatureEntries[] = {
enterprise_signals::features::kProfileSignalsReportingEnabled)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -436,7 +436,7 @@ Index: chrome/browser/about_flags.cc
{"projects-panel", flag_descriptions::kProjectsPanelName,
flag_descriptions::kProjectsPanelDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(tab_groups::kProjectsPanel,
@@ -12343,7 +12370,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12363,7 +12390,7 @@ const FeatureEntry kFeatureEntries[] = {
"AndroidDesktopZoomScaling")},
#endif
@@ -445,7 +445,7 @@ Index: chrome/browser/about_flags.cc
{"profile-picker-text-variations",
flag_descriptions::kProfilePickerTextVariationsName,
flag_descriptions::kProfilePickerTextVariationsDescription,
@@ -12354,7 +12381,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12374,7 +12401,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -454,7 +454,7 @@ Index: chrome/browser/about_flags.cc
{"lens-overlay-optimization-filter",
flag_descriptions::kLensOverlayOptimizationFilterName,
flag_descriptions::kLensOverlayOptimizationFilterDescription, kOsDesktop,
@@ -12377,7 +12404,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12397,7 +12424,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kConnectionAllowlistsChoices)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -463,7 +463,7 @@ Index: chrome/browser/about_flags.cc
{"read-anything-with-readability-enabled",
flag_descriptions::kReadAnythingWithReadabilityName,
flag_descriptions::kReadAnythingWithReadabilityDescription, kOsDesktop,
@@ -12385,7 +12412,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12405,7 +12432,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -472,7 +472,7 @@ Index: chrome/browser/about_flags.cc
{"read-anything-omnibox-chip",
flag_descriptions::kReadAnythingOmniboxChipName,
flag_descriptions::kReadAnythingOmniboxChipDescription, kOsDesktop,
@@ -12414,7 +12441,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12434,7 +12461,7 @@ const FeatureEntry kFeatureEntries[] = {
autofill::features::kAutofillDisableBnplCountryCheckForTesting)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -481,7 +481,7 @@ Index: chrome/browser/about_flags.cc
{"infobar-prioritization", flag_descriptions::kInfobarPrioritizationName,
flag_descriptions::kInfobarPrioritizationDescription, kOsDesktop,
FEATURE_VALUE_TYPE(infobars::features::kInfobarPrioritization)},
@@ -12425,7 +12452,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12445,7 +12472,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kInfobarRefresh)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -490,7 +490,7 @@ Index: chrome/browser/about_flags.cc
{"read-anything-immersive-reading-mode",
flag_descriptions::kReadAnythingImmersiveReadingModeName,
flag_descriptions::kReadAnythingImmersiveReadingModeDescription,
@@ -12438,7 +12465,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12458,7 +12485,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -499,7 +499,7 @@ Index: chrome/browser/about_flags.cc
{"lens-overlay-non-blocking-privacy-notice",
flag_descriptions::kLensOverlayNonBlockingPrivacyNoticeName,
flag_descriptions::kLensOverlayNonBlockingPrivacyNoticeDescription,
@@ -12511,7 +12538,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12531,7 +12558,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -508,7 +508,7 @@ Index: chrome/browser/about_flags.cc
{"enable-your-saved-info-settings-page",
flag_descriptions::kYourSavedInfoSettingsPageName,
flag_descriptions::kYourSavedInfoSettingsPageDescription, kOsDesktop,
@@ -12686,7 +12713,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12706,7 +12733,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(autofill::features::kAutofillAiWithDataSchema)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -517,7 +517,7 @@ Index: chrome/browser/about_flags.cc
{"read-anything-line-focus", flag_descriptions::kReadAnythingLineFocusName,
flag_descriptions::kReadAnythingLineFocusDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kReadAnythingLineFocus)},
@@ -12710,7 +12737,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12730,7 +12757,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(payments::android::kDeduplicateNativePaymentApps)},
#endif
@@ -526,7 +526,7 @@ Index: chrome/browser/about_flags.cc
{"password-upload-ui-update",
flag_descriptions::kPasswordUploadUiUpdateName,
flag_descriptions::kPasswordUploadUiUpdateDescription,
@@ -12752,7 +12779,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12772,7 +12799,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kAlwaysDrawCompositedToolbarHairline)},
#endif
@@ -535,7 +535,7 @@ Index: chrome/browser/about_flags.cc
{"saas-usage-reporting", flag_descriptions::kSaasUsageReportingName,
flag_descriptions::kSaasUsageReportingDescription,
kOsLinux | kOsMac | kOsWin,
@@ -13171,7 +13198,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -13191,7 +13218,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(blink::features::kUserMediaElement)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.cc
--- chrome/browser/chrome_content_browser_client.cc.orig
+++ chrome/browser/chrome_content_browser_client.cc
@@ -608,7 +608,7 @@
@@ -610,7 +610,7 @@
#include "third_party/cros_system_api/switches/chrome_switches.h"
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -10,7 +10,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -619,7 +619,7 @@
@@ -621,7 +621,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -19,7 +19,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "components/webapps/isolated_web_apps/scheme.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -1519,7 +1519,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1521,7 +1521,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
registry->RegisterBooleanPref(prefs::kDataURLWhitespacePreservationEnabled,
true);
registry->RegisterBooleanPref(prefs::kEnableUnsafeSwiftShader, false);
@@ -28,7 +28,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1795,7 +1795,7 @@ ChromeContentBrowserClient::GetStoragePartitionConfigF
@@ -1797,7 +1797,7 @@ ChromeContentBrowserClient::GetStoragePartitionConfigF
#if BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -37,7 +37,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
if (content::SiteIsolationPolicy::ShouldUrlUseApplicationIsolationLevel(
browser_context, site)) {
CHECK(url::Origin::Create(site).scheme() == webapps::kIsolatedAppScheme);
@@ -2692,7 +2692,7 @@ bool ChromeContentBrowserClient::ShouldUrlUseApplicati
@@ -2694,7 +2694,7 @@ bool ChromeContentBrowserClient::ShouldUrlUseApplicati
const GURL& url) {
#if BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -46,7 +46,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
if (!content::AreIsolatedWebAppsEnabled(browser_context)) {
return false;
@@ -2799,7 +2799,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
@@ -2801,7 +2801,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line,
int child_process_id) {
@@ -56,7 +56,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#if BUILDFLAG(IS_MAC)
std::unique_ptr<metrics::ClientInfo> client_info =
GoogleUpdateSettings::LoadMetricsClientInfo();
@@ -2808,7 +2810,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2810,7 +2812,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
client_info->client_id);
}
#elif BUILDFLAG(IS_POSIX)
@@ -65,7 +65,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
pid_t pid;
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
command_line->AppendSwitchASCII(
@@ -3160,7 +3162,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3162,7 +3164,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
}
}
@@ -74,7 +74,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4188,7 +4190,7 @@ GetPreferredColorScheme(const WebPreferences& web_pref
@@ -4190,7 +4192,7 @@ GetPreferredColorScheme(const WebPreferences& web_pref
std::optional<SkColor> GetRootScrollbarThemeColor(WebContents* web_contents) {
bool root_scrollbar_follows_browser_theme = false;
@@ -83,7 +83,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
root_scrollbar_follows_browser_theme = base::FeatureList::IsEnabled(
blink::features::kRootScrollbarFollowsBrowserTheme);
#endif
@@ -5200,7 +5202,7 @@ void ChromeContentBrowserClient::GetAdditionalAllowedS
@@ -5220,7 +5222,7 @@ void ChromeContentBrowserClient::GetAdditionalAllowedS
additional_allowed_schemes->push_back(content::kChromeUIScheme);
additional_allowed_schemes->push_back(content::kChromeUIUntrustedScheme);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -92,7 +92,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
additional_allowed_schemes->push_back(webapps::kIsolatedAppScheme);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -5254,7 +5256,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -5274,7 +5276,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -101,7 +101,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -6151,7 +6153,7 @@ ChromeContentBrowserClient::CreateNonNetworkNavigation
@@ -6171,7 +6173,7 @@ ChromeContentBrowserClient::CreateNonNetworkNavigation
}
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -110,7 +110,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
if (scheme == webapps::kIsolatedAppScheme) {
if (content::AreIsolatedWebAppsEnabled(browser_context) &&
!browser_context->ShutdownStarted()) {
@@ -6223,7 +6225,7 @@ void ChromeContentBrowserClient::
@@ -6243,7 +6245,7 @@ void ChromeContentBrowserClient::
DCHECK(factories);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -119,7 +119,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
if (content::AreIsolatedWebAppsEnabled(browser_context) &&
!browser_context->ShutdownStarted()) {
std::optional<url::Origin> app_origin;
@@ -6270,7 +6272,7 @@ void ChromeContentBrowserClient::
@@ -6290,7 +6292,7 @@ void ChromeContentBrowserClient::
DCHECK(factories);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -128,7 +128,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
if (content::AreIsolatedWebAppsEnabled(browser_context) &&
!browser_context->ShutdownStarted()) {
factories->emplace(webapps::kIsolatedAppScheme,
@@ -6541,7 +6543,7 @@ void ChromeContentBrowserClient::
@@ -6561,7 +6563,7 @@ void ChromeContentBrowserClient::
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -137,7 +137,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
{
auto* rph = content::RenderProcessHost::FromID(render_process_id);
content::BrowserContext* browser_context = rph->GetBrowserContext();
@@ -7160,7 +7162,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco
@@ -7180,7 +7182,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco
CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -146,7 +146,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Handle the google-chrome:// scheme (and chromium://).
// If the scheme is present, we strip it and navigate to the inner URL.
// This avoids launching a new browser instance via the OS handler.
@@ -7289,7 +7291,7 @@ bool ChromeContentBrowserClient::HandleWebUI(
@@ -7309,7 +7311,7 @@ bool ChromeContentBrowserClient::HandleWebUI(
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -155,7 +155,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Rewrite chrome://settings/enhancedAutofill to chrome://settings/autofill.
if (url->SchemeIs(content::kChromeUIScheme) &&
@@ -7578,7 +7580,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7598,7 +7600,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.
@@ -164,7 +164,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// This is possibly called before `g_browser_process` is initialized.
PrefService* local_state;
if (g_browser_process) {
@@ -8004,7 +8006,7 @@ void ChromeContentBrowserClient::
@@ -8024,7 +8026,7 @@ void ChromeContentBrowserClient::
GrantAdditionalRequestPrivilegesToWorkerProcess(int child_id,
const GURL& script_url) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -173,7 +173,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// IWA Service Workers need to be explicitly granted access to their origin
// because isolated-app: isn't a web-safe scheme that can be accessed by
// default.
@@ -8469,7 +8471,7 @@ ChromeContentBrowserClient::GetAlternativeErrorPageOve
@@ -8489,7 +8491,7 @@ ChromeContentBrowserClient::GetAlternativeErrorPageOve
content::BrowserContext* browser_context,
int32_t error_code) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.h
--- chrome/browser/chrome_content_browser_client.h.orig
+++ chrome/browser/chrome_content_browser_client.h
@@ -576,7 +576,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -577,7 +577,7 @@ class ChromeContentBrowserClient : public content::Con
const GURL& site_url) override;
std::unique_ptr<content::TracingDelegate> CreateTracingDelegate() override;
bool IsSystemWideTracingEnabled() override;
@@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.h
--- chrome/browser/flag_descriptions.h.orig
+++ chrome/browser/flag_descriptions.h
@@ -8578,6 +8578,18 @@ inline constexpr char kAndroidEntraSsoDescription[] =
@@ -8588,6 +8588,18 @@ inline constexpr char kAndroidEntraSsoDescription[] =
"Enables native support for Entra SSO on Android provided by selected "
"Authentication Brokers.";
@@ -1,7 +1,7 @@
Index: chrome/browser/glic/public/features.cc
--- chrome/browser/glic/public/features.cc.orig
+++ chrome/browser/glic/public/features.cc
@@ -58,7 +58,7 @@ BASE_FEATURE(kGlicCreateTabAdjacent, base::FEATURE_ENA
@@ -67,7 +67,7 @@ BASE_FEATURE(kGlicCreateTabAdjacent, base::FEATURE_ENA
// When off, disables both live mode and the glic floating panel.
BASE_FEATURE(kGlicLiveMode,
@@ -28,7 +28,7 @@ Index: chrome/browser/glic/widget/glic_widget.cc
int resize_border = OpaqueBrowserFrameViewLayout::kFrameBorderThickness;
#endif
const bool can_resize = GetWidget()->widget_delegate()->CanResize();
@@ -347,7 +347,7 @@ std::unique_ptr<views::WidgetDelegate> GlicWidget::Cre
@@ -356,7 +356,7 @@ std::unique_ptr<views::WidgetDelegate> GlicWidget::Cre
return std::make_unique<GlicClientView>(widget, contents_view);
}));
@@ -37,7 +37,7 @@ Index: chrome/browser/glic/widget/glic_widget.cc
delegate->SetFrameViewFactory(base::BindRepeating(
[](views::Widget* widget) -> std::unique_ptr<views::FrameView> {
return std::make_unique<GlicFrameView>(widget);
@@ -427,7 +427,7 @@ std::unique_ptr<GlicWidget> GlicWidget::Create(views::
@@ -436,7 +436,7 @@ std::unique_ptr<GlicWidget> GlicWidget::Create(views::
#if BUILDFLAG(IS_MAC)
params.animation_enabled = true;
#endif // BUILDFLAG(IS_MAC)
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
ref->can_release_capture_ = false;
#endif
ref->start_point_in_screen_ =
@@ -1035,7 +1035,7 @@ TabDragController::Liveness TabDragController::DragBro
@@ -1039,7 +1039,7 @@ TabDragController::Liveness TabDragController::DragBro
CHECK_EQ(SetCapture(target_context), Liveness::kAlive);
}
@@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -2270,7 +2270,7 @@ void TabDragController::CompleteDrag() {
@@ -2277,7 +2277,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/41321838) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2698,7 +2698,7 @@ TabDragController::Liveness TabDragController::GetLoca
@@ -2705,7 +2705,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
}
@@ -19,7 +19,7 @@ Index: chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
kLinuxShareIconResourceName =
"//resources/cr_components/searchbox/icons/share_cr23.svg";
#else
@@ -688,7 +688,7 @@ std::string SearchboxHandler::AutocompleteIconToResour
@@ -689,7 +689,7 @@ std::string SearchboxHandler::AutocompleteIconToResour
if (icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
return kWinShareIconResourceName;
}
@@ -1,7 +1,7 @@
Index: components/password_manager/core/browser/password_autofill_manager.h
--- components/password_manager/core/browser/password_autofill_manager.h.orig
+++ components/password_manager/core/browser/password_autofill_manager.h
@@ -293,7 +293,7 @@ class PasswordAutofillManager : public autofill::Autof
@@ -299,7 +299,7 @@ class PasswordAutofillManager : public autofill::Autof
// Stores the controller of warning popup UI on cross domain filling.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
@@ -65,7 +65,7 @@ Index: media/base/media_switches.cc
// Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
// on chromeos, but needs an experiment on linux.
BASE_FEATURE(kAcceleratedVideoDecodeLinux,
@@ -800,7 +822,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, base::FEATURE_E
@@ -812,7 +834,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, base::FEATURE_E
// Enables VSync aligned MJPEG decoding.
BASE_FEATURE(kVSyncMjpegDecoding, base::FEATURE_DISABLED_BY_DEFAULT);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -74,7 +74,7 @@ Index: media/base/media_switches.cc
// Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -995,7 +1017,7 @@ BASE_FEATURE(kMediaFoundationMultiGpuAdapterSelection,
@@ -1007,7 +1029,7 @@ BASE_FEATURE(kMediaFoundationMultiGpuAdapterSelection,
BASE_FEATURE(kHardwareMediaKeyHandling,
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
base::FEATURE_ENABLED_BY_DEFAULT
@@ -83,7 +83,7 @@ Index: media/base/media_switches.cc
#if BUILDFLAG(USE_MPRIS)
base::FEATURE_ENABLED_BY_DEFAULT
#else
@@ -1371,7 +1393,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
@@ -1383,7 +1405,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
BASE_FEATURE(kUseSharedImageInOOPVDProcess, base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
@@ -92,7 +92,7 @@ Index: media/base/media_switches.cc
// Spawn utility processes to perform hardware encode acceleration instead of
// using the GPU process.
BASE_FEATURE(kUseOutOfProcessVideoEncoding, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1433,7 +1455,7 @@ BASE_FEATURE(kRecordMediaEngagementScores, base::FEATU
@@ -1445,7 +1467,7 @@ BASE_FEATURE(kRecordMediaEngagementScores, base::FEATU
// Enables Media Engagement Index recording for Web Audio playbacks.
BASE_FEATURE(kRecordWebAudioEngagement, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -101,7 +101,7 @@ Index: media/base/media_switches.cc
// Reduces the number of buffers needed in the output video frame pool to
// populate the Renderer pipeline for hardware accelerated VideoDecoder in
// non-low latency scenarios.
@@ -1760,7 +1782,7 @@ bool IsSystemLoopbackCaptureSupported() {
@@ -1772,7 +1794,7 @@ bool IsSystemLoopbackCaptureSupported() {
#elif BUILDFLAG(IS_MAC)
return (IsMacSckSystemLoopbackCaptureSupported() ||
IsMacCatapSystemLoopbackCaptureSupported());
@@ -38,7 +38,7 @@ Index: media/base/media_switches.h
MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
@@ -364,7 +376,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -47,7 +47,7 @@ Index: media/base/media_switches.h
MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
@@ -472,7 +484,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
@@ -473,7 +485,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseSharedImageInOOPVDProcess);
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
@@ -1,7 +1,7 @@
Index: services/device/public/cpp/device_features.cc
--- services/device/public/cpp/device_features.cc.orig
+++ services/device/public/cpp/device_features.cc
@@ -157,11 +157,11 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
@@ -161,11 +161,11 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() {
// a USB interface is busy.
#if BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kAutomaticUsbDetach, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1,7 +1,7 @@
Index: services/device/public/cpp/device_features.h
--- services/device/public/cpp/device_features.h.orig
+++ services/device/public/cpp/device_features.h
@@ -59,11 +59,11 @@ extern const DEVICE_FEATURES_EXPORT
@@ -60,11 +60,11 @@ extern const DEVICE_FEATURES_EXPORT
DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled();
@@ -1,7 +1,7 @@
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig
+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
@@ -218,7 +218,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
@@ -225,7 +225,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
return selected_operation_;
}
@@ -1,7 +1,7 @@
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig
+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
@@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
@@ -73,7 +73,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
// The offset of |drag_widget_| relative to the mouse position.
gfx::Vector2d offset;
@@ -10,7 +10,7 @@ Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
// The last received drag location. The drag widget is moved asynchronously
// so its position is updated when the UI thread has time for that. When
// the first change to the location happens, a call to UpdateDragWidget()
@@ -88,7 +88,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
@@ -94,7 +94,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
const gfx::Point& root_location,
int allowed_operations,
ui::mojom::DragEventSource source) override;
@@ -19,7 +19,7 @@ Index: ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
#else
std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
@@ -1285,7 +1285,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
@@ -1290,7 +1290,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
// DesktopWindowTreeHost:
// Linux subclasses this host and adds some Linux specific bits.