Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions fedora_patches/chromium-125-disable-FFmpegAllowLists.patch

This file was deleted.

This file was deleted.

41 changes: 9 additions & 32 deletions patches/disable-lens.patch
Original file line number Diff line number Diff line change
@@ -1,39 +1,12 @@
diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc
index d029f6f7242b4..bf1a8c24e5d2d 100644
index 12b0f931fa71d..cc5952d04b9ae 100644
--- a/components/lens/lens_features.cc
+++ b/components/lens/lens_features.cc
@@ -13,7 +13,7 @@ namespace lens::features {
@@ -16,16 +16,11 @@ namespace lens::features {

BASE_FEATURE(kLensStandalone,
"LensStandalone",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);

BASE_FEATURE(kLensSearchOptimizations,
"LensSearchOptimizations",
@@ -21,7 +21,7 @@ BASE_FEATURE(kLensSearchOptimizations,

BASE_FEATURE(kEnableLatencyLogging,
"LensImageLatencyLogging",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);

BASE_FEATURE(kEnableRegionSearchKeyboardShortcut,
"LensEnableRegionSearchKeyboardShortcut",
@@ -33,7 +33,7 @@ BASE_FEATURE(kEnableImageTranslate,

BASE_FEATURE(kEnableImageSearchSidePanelFor3PDse,
"EnableImageSearchSidePanelFor3PDse",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);

BASE_FEATURE(kLensRegionSearchStaticPage,
"LensRegionSearchStaticPage",
@@ -41,16 +41,11 @@ BASE_FEATURE(kLensRegionSearchStaticPage,

BASE_FEATURE(kEnableContextMenuInLensSidePanel,
"EnableContextMenuInLensSidePanel",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);

BASE_FEATURE(kLensOverlay,
Expand All @@ -49,10 +22,10 @@ index d029f6f7242b4..bf1a8c24e5d2d 100644
BASE_FEATURE(kLensOverlayTranslateButton,
"LensOverlayTranslateButton",
diff --git a/components/lens/lens_overlay_permission_utils.cc b/components/lens/lens_overlay_permission_utils.cc
index 5c54e349a6d27..72f40a9593388 100644
index 5c54e349a6d27..1c3a00f4c0f67 100644
--- a/components/lens/lens_overlay_permission_utils.cc
+++ b/components/lens/lens_overlay_permission_utils.cc
@@ -19,7 +19,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -19,11 +19,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// policies are registered just in case.
registry->RegisterIntegerPref(
kLensOverlaySettings,
Expand All @@ -61,4 +34,8 @@ index 5c54e349a6d27..72f40a9593388 100644

registry->RegisterIntegerPref(
kGenAiLensOverlaySettings,

- static_cast<int>(GenAiLensOverlaySettingsPolicyValue::kAllowed));
+ static_cast<int>(GenAiLensOverlaySettingsPolicyValue::kDisabled));

registry->RegisterBooleanPref(kLensSharingPageScreenshotEnabled, false);
registry->RegisterBooleanPref(kLensSharingPageContentEnabled, false);
6 changes: 3 additions & 3 deletions patches/disable-promotions-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 8740af9bc6cd6..e7eaae8ea2edb 100644
index d26f0998c81fc..857eda407e3ab 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -912,7 +912,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() {
@@ -929,7 +929,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() {
// static
void StartupBrowserCreator::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
- registry->RegisterBooleanPref(prefs::kPromotionsEnabled, true);
+ registry->RegisterBooleanPref(prefs::kPromotionsEnabled, false);
#if !BUILDFLAG(IS_CHROMEOS_ASH)
#if !BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kCommandLineFlagSecurityWarningsEnabled,
true);
69 changes: 26 additions & 43 deletions patches/remove-unused-preferences.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
index e33e49405479b..ee86bb13d87d4 100644
index d79fef3c81ede..1470d3c74a7b7 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -27,7 +27,7 @@
Expand All @@ -11,7 +11,7 @@ index e33e49405479b..ee86bb13d87d4 100644
section="people">
<settings-people-page prefs="{{prefs}}"
page-visibility="[[pageVisibility]]">
@@ -215,13 +215,6 @@
@@ -219,13 +219,6 @@
</settings-spell-check-page>
</settings-section>
</template>
Expand All @@ -25,26 +25,12 @@ index e33e49405479b..ee86bb13d87d4 100644
</if>
<template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]"
restamp>
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.ts b/chrome/browser/resources/settings/basic_page/basic_page.ts
index 06ed8d7e28bc0..165fdeea5c3e6 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -350,8 +350,7 @@ export class SettingsBasicPageElement extends SettingsBasicPageElementBase {
}

private showSafetyCheckPage_(visibility?: boolean): boolean {
- return !loadTimeData.getBoolean('enableSafetyHub') &&
- this.showPage_(visibility);
+ return false && this.showPage_(visibility); // Kept to prevent errors
}

private showSafetyHubEntryPointPage_(visibility?: boolean): boolean {
diff --git a/chrome/browser/resources/settings/languages_page/translate_page.html b/chrome/browser/resources/settings/languages_page/translate_page.html
index fcebeb17e856f..fbe0becf128c5 100644
index ad9a348aca868..4ba2509c855b5 100644
--- a/chrome/browser/resources/settings/languages_page/translate_page.html
+++ b/chrome/browser/resources/settings/languages_page/translate_page.html
@@ -1,10 +1,4 @@
<style include="cr-shared-style settings-shared md-select iron-flex"></style>
<style include="cr-shared-style settings-shared md-select"></style>
-<settings-toggle-button id="offerTranslateOtherLanguages"
- pref="{{prefs.translate.enabled}}"
- label="$i18n{offerToEnableTranslate}"
Expand All @@ -55,7 +41,7 @@ index fcebeb17e856f..fbe0becf128c5 100644
<div class="cr-row continuation">
<div id="targetLanguageLabel" class="flex cr-padded-text"
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index ca51e9017e5bc..3f290596b8576 100644
index 4d187ff2f57a9..788d8af1e9f0a 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -107,12 +107,6 @@ shown on non-ChromeOS platforms -->
Expand All @@ -72,10 +58,10 @@ index ca51e9017e5bc..3f290596b8576 100644
<if expr="not chromeos_ash">
<template is="dom-if" if="[[signinAllowed_]]">
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 7d47622af880c..468303b31b657 100644
index b2577376fdb93..5fca74b795af4 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -87,8 +87,8 @@
@@ -76,8 +76,8 @@
</cr-link-row>
</template>
<cr-link-row id="securityLinkRow" start-icon="privacy:lock"
Expand All @@ -86,7 +72,7 @@ index 7d47622af880c..468303b31b657 100644
on-click="onSecurityPageClick_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
<cr-link-row id="permissionsLinkRow" start-icon="privacy:page-info"
@@ -191,7 +191,7 @@
@@ -180,7 +180,7 @@
</template>

<template is="dom-if" route-path="/security">
Expand All @@ -96,10 +82,10 @@ index 7d47622af880c..468303b31b657 100644
learn-more-url="$i18n{safeBrowsingHelpCenterURL}">
<settings-security-page prefs="{{prefs}}"
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
index f3df01d26ac04..28eef94c62fee 100644
index e09c5bda751ca..642feef913a1c 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -643,8 +643,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
@@ -631,8 +631,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
}

private shouldShowAdPrivacy_(): boolean {
Expand All @@ -110,7 +96,7 @@ index f3df01d26ac04..28eef94c62fee 100644

private shouldShowComposeProactiveNudge_(): boolean {
diff --git a/chrome/browser/resources/settings/privacy_page/security_page.html b/chrome/browser/resources/settings/privacy_page/security_page.html
index 6ac062af92b06..0edc8e2134222 100644
index 117b42d142e9e..0edc8e2134222 100644
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -79,155 +79,6 @@
Expand Down Expand Up @@ -170,7 +156,7 @@ index 6ac062af92b06..0edc8e2134222 100644
- </div>
- </li>
- <template is="dom-if" if="[[!enablePasswordLeakToggleMove_]]">
- <li>
- <li id="whenOnBulFive">
- <cr-icon icon="settings20:vpn-key-new" aria-hidden="true">
- </cr-icon>
- <div class="secondary">
Expand Down Expand Up @@ -313,10 +299,10 @@ index 552f3b5534b01..7c7bad3962f68 100644
this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now();
}
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index 12390b95903a6..8f8fabc099463 100644
index ce2f533e5c790..77b68e40044c7 100644
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -184,7 +184,7 @@ function createRoutes(): SettingsRoutes {
@@ -182,7 +182,7 @@ function createRoutes(): SettingsRoutes {

if (!loadTimeData.getBoolean('isGuest')) {
r.PEOPLE = r.BASIC.createSection(
Expand All @@ -326,7 +312,7 @@ index 12390b95903a6..8f8fabc099463 100644
r.SIGN_OUT = r.PEOPLE.createChild('/signOut');
r.SIGN_OUT.isNavigableDialog = true;
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
index 5f0ac710c3a63..30d076f0127e3 100644
index 20e21e770d21f..897469dece88a 100644
--- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -54,7 +54,7 @@
Expand All @@ -339,10 +325,10 @@ index 5f0ac710c3a63..30d076f0127e3 100644
</a>
<a role="menuitem" id="autofill" href="/autofill"
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
index 89f3190f3bde5..2ff32d4c675ed 100644
index b57e66a90e566..86629759a9bce 100644
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -353,10 +353,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -346,10 +346,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
html_source->AddBoolean("isOSSettings", false);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

Expand All @@ -352,24 +338,21 @@ index 89f3190f3bde5..2ff32d4c675ed 100644
- html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
+ html_source->AddBoolean("showPrivacyGuide", false);

html_source->AddBoolean(
"enableCbdTimeframeRequired",
html_source->AddBoolean("enableHandTrackingContentSetting",
#if BUILDFLAG(ENABLE_VR)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 1010d8d4b20a7..08b60ed8b845d 100644
index b2fe398bcf5a8..39abd4a64ee3b 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -1030,11 +1030,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger,
@@ -961,7 +961,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger,
#endif

// Enables Safety Hub feature.
BASE_FEATURE(kSafetyHub,
"SafetyHub",
-#if BUILDFLAG(IS_ANDROID)
base::FEATURE_DISABLED_BY_DEFAULT
-#else
- base::FEATURE_ENABLED_BY_DEFAULT
-#endif // BUILDFLAG(IS_ANDROID)
);
-BASE_FEATURE(kSafetyHub, "SafetyHub", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kSafetyHub, "SafetyHub", base::FEATURE_DISABLED_BY_DEFAULT);

#if BUILDFLAG(IS_ANDROID)
// Enables Safety Hub card in magic stack.
diff --git a/components/security_interstitials/core/browser/resources/interstitial_large.js b/components/security_interstitials/core/browser/resources/interstitial_large.js
index 69992131be6df..9f7e15f55bc0a 100644
--- a/components/security_interstitials/core/browser/resources/interstitial_large.js
Expand Down
7 changes: 4 additions & 3 deletions patches/set-browser-defaults.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index dc3191190654b..0be79c7d5dba7 100644
index ee2364fc09eb4..f3f9300e3484a 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -97,10 +97,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
Expand All @@ -15,12 +15,13 @@ index dc3191190654b..0be79c7d5dba7 100644
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
@@ -109,19 +109,19 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -109,20 +109,20 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
- blink::kWebRTCIPHandlingDefault);
+ blink::kWebRTCIPHandlingDisableNonProxiedUdp);
registry->RegisterListPref(prefs::kWebRTCIPHandlingUrl, base::Value::List());
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
Expand All @@ -39,7 +40,7 @@ index dc3191190654b..0be79c7d5dba7 100644
#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)

#if BUILDFLAG(IS_MAC)
@@ -170,7 +170,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -171,7 +171,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
#endif

registry->RegisterBooleanPref(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 8771a5dcdb5dd..3029bbb1101df 100644
index 2e4e5205b5de0..b42626fde7d8f 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -372,7 +372,7 @@ config("compiler") {
@@ -382,7 +382,7 @@ config("compiler") {
} else if ((is_posix && !is_nacl) || is_fuchsia) {
if (current_os != "aix") {
# Not available on aix.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
1 file changed, 4 insertions(+)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 3029bbb1101df..345faddef7534 100644
index b42626fde7d8f..608098e9feb3b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -388,6 +388,10 @@ config("compiler") {
@@ -398,6 +398,10 @@ config("compiler") {
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
1 file changed, 4 insertions(+)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 345faddef7534..e5e3ec4b201a3 100644
index 608098e9feb3b..41cd325f53dd8 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -392,6 +392,10 @@ config("compiler") {
@@ -402,6 +402,10 @@ config("compiler") {
cflags += [ "-fwrapv" ]
}

Expand Down
4 changes: 2 additions & 2 deletions vanadium_patches/0012-Checkout-PGO-profiles.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] Checkout PGO profiles
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 52d2c6e300624..4e22051c3515e 100644
index 928234f52fad2..39c3cb827ce9e 100644
--- a/DEPS
+++ b/DEPS
@@ -145,7 +145,7 @@ vars = {
@@ -149,7 +149,7 @@ vars = {
'checkout_clang_coverage_tools': False,

# Fetch the pgo profiles to optimize official builds.
Expand Down
2 changes: 1 addition & 1 deletion vanadium_patches/0013-disable-checkout_nacl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 4e22051c3515e..d54cab2a9fc70 100644
index 39c3cb827ce9e..deb75a8c4e14d 100644
--- a/DEPS
+++ b/DEPS
@@ -114,7 +114,7 @@ vars = {
Expand Down
Loading