diff --git a/patches/disable-secondary-browser-features-by-default.patch b/patches/disable-secondary-browser-features-by-default.patch index cfffcaab..197bd886 100644 --- a/patches/disable-secondary-browser-features-by-default.patch +++ b/patches/disable-secondary-browser-features-by-default.patch @@ -11,20 +11,24 @@ index 2ddc318a2b738..6fd447d8e5ce1 100644 } #endif +diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc +index f792842f91922..28cc7122da39c 100644 +--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc ++++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc +@@ -49,7 +49,7 @@ const int kChromeLabsActivationThresholdDefaultValue = -1; + const int kChromeLabsNewExperimentPrefValue = -1; + + void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +- registry->RegisterBooleanPref(kBrowserLabsEnabledEnterprisePolicy, true); ++ registry->RegisterBooleanPref(kBrowserLabsEnabledEnterprisePolicy, false); + #if BUILDFLAG(IS_CHROMEOS_ASH) + registry->RegisterDictionaryPref(kChromeLabsNewBadgeDictAshChrome); + #endif diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc -index 703fc03b7e6cc..60347901f0d21 100644 +index 886af67983837..120272ceacfa8 100644 --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc -@@ -22,7 +22,7 @@ BASE_FEATURE(kWebAppIconInTitlebar, - ); - - // Enables Chrome Labs menu in the toolbar. See https://crbug.com/1145666 --BASE_FEATURE(kChromeLabs, "ChromeLabs", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kChromeLabs, "ChromeLabs", base::FEATURE_DISABLED_BY_DEFAULT); - const char kChromeLabsActivationParameterName[] = - "chrome_labs_activation_percentage"; - const base::FeatureParam kChromeLabsActivationPercentage{ -@@ -280,11 +280,7 @@ BASE_FEATURE(kTabGroupsCollapseFreezing, +@@ -243,11 +243,7 @@ BASE_FEATURE(kTabGroupsCollapseFreezing, // https://crbug.com/928954 BASE_FEATURE(kTabHoverCardImages, "TabHoverCardImages", @@ -37,7 +41,7 @@ index 703fc03b7e6cc..60347901f0d21 100644 const char kTabHoverCardImagesNotReadyDelayParameterName[] = diff --git a/components/history_clusters/core/features.cc b/components/history_clusters/core/features.cc -index a2244cdbd0e7e..9058d86b5e8d7 100644 +index 897479817c607..a5fad5e8bb7fd 100644 --- a/components/history_clusters/core/features.cc +++ b/components/history_clusters/core/features.cc @@ -26,7 +26,7 @@ constexpr auto enabled_by_default_desktop_only = diff --git a/patches/remove-unused-preferences.patch b/patches/remove-unused-preferences.patch index ff168cf3..b80984ec 100644 --- a/patches/remove-unused-preferences.patch +++ b/patches/remove-unused-preferences.patch @@ -43,7 +43,7 @@ index ca51e9017e5bc..3f290596b8576 100644
-

$i18n{advancedPageTitle}

+

$i18n{securityPageTitle}

- diff --git a/chrome/browser/resources/settings/privacy_page/security_page.ts b/chrome/browser/resources/settings/privacy_page/security_page.ts -index 335c735439b24..b0371a95c7dbe 100644 +index 552f3b5534b01..7c7bad3962f68 100644 --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -333,10 +333,6 @@ export class SettingsSecurityPageElement extends +@@ -342,10 +342,6 @@ export class SettingsSecurityPageElement extends } }); @@ -285,12 +297,12 @@ index 5f0ac710c3a63..30d076f0127e3 100644 AddBoolean("userCannotManuallyEnterPassword", false); - #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -353,10 +353,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) + html_source->AddBoolean("isOSSettings", false); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) - bool show_privacy_guide = - base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) || @@ -301,10 +313,10 @@ index 1d51499e5f1a4..2953b0d365232 100644 html_source->AddBoolean( "enableCbdTimeframeRequired", diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc -index b27e1ead33dc9..b36b34c9a9f8a 100644 +index 1010d8d4b20a7..08b60ed8b845d 100644 --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1074,11 +1074,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger, +@@ -1030,11 +1030,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger, // Enables Safety Hub feature. BASE_FEATURE(kSafetyHub, "SafetyHub", diff --git a/patches/revert-130-optimizer-jit-change.patch b/patches/revert-130-optimizer-jit-change.patch index 7fbeaaef..3ccdc144 100644 --- a/patches/revert-130-optimizer-jit-change.patch +++ b/patches/revert-130-optimizer-jit-change.patch @@ -1,3 +1,25 @@ +diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html +index 7d47622af880c..144760befee18 100644 +--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html ++++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html +@@ -119,7 +119,7 @@ + $i18n{siteSettingsJavascriptOptimizerDescription} + + + + diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts index 4ed920a8aabf9..8436627f13298 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts @@ -11,8 +33,34 @@ index 4ed920a8aabf9..8436627f13298 100644 KEYBOARD_LOCK = 'keyboard-lock', LOCAL_FONTS = 'local-fonts', MIC = 'media-stream-mic', // AKA Microphone. +diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts +index f41407671c3aa..dbd118d942f34 100644 +--- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts ++++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts +@@ -132,7 +132,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends + case ContentSettingsTypes.FEDERATED_IDENTITY_API: + case ContentSettingsTypes.IMAGES: + case ContentSettingsTypes.JAVASCRIPT: +- case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER: ++ case ContentSettingsTypes.JAVASCRIPT_JIT: + case ContentSettingsTypes.MIXEDSCRIPT: + case ContentSettingsTypes.PAYMENT_HANDLER: + case ContentSettingsTypes.POPUPS: +diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html +index ada08944de384..7ed0a2fa850b3 100644 +--- a/chrome/browser/resources/settings/site_settings/site_details.html ++++ b/chrome/browser/resources/settings/site_settings/site_details.html +@@ -247,7 +247,7 @@ + label="$i18n{siteSettingsInsecureContent}"> + + + diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index a42f9b0e0ed2b..290a515734e18 100644 +index dfb10f1a4817d..a02b8cdeede73 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -225,7 +225,7 @@ function getCategoryItemMap(): Map { @@ -24,7 +72,7 @@ index a42f9b0e0ed2b..290a515734e18 100644 label: 'siteSettingsJavascriptOptimizer', icon: 'privacy:v8', enabledLabel: 'siteSettingsJavascriptOptimizerAllowed', -@@ -565,7 +565,7 @@ export class SettingsSiteSettingsPageElement extends +@@ -562,7 +562,7 @@ export class SettingsSiteSettingsPageElement extends Id.ANTI_ABUSE, Id.SITE_DATA, Id.PERFORMANCE, @@ -34,50 +82,14 @@ index a42f9b0e0ed2b..290a515734e18 100644 Id.OFFER_WRITING_HELP, ]), diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts -index ee83684be5439..dce066b5988b6 100644 +index 0c615bb7e5f4f..754fd07a0da5d 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts -@@ -97,7 +97,7 @@ export function getLocalizationStringForContentType( +@@ -99,6 +99,7 @@ export function getLocalizationStringForContentType( return 'siteSettingsZoomLevelsMidSentence'; // The following members do not have a mid-sentence localization. case ContentSettingsTypes.ANTI_ABUSE: -- case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER: + case ContentSettingsTypes.JAVASCRIPT_JIT: case ContentSettingsTypes.PDF_DOCUMENTS: case ContentSettingsTypes.PERFORMANCE: case ContentSettingsTypes.PRIVATE_NETWORK_DEVICES: -diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts -index f41407671c3aa..dbd118d942f34 100644 ---- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts -+++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts -@@ -132,7 +132,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends - case ContentSettingsTypes.FEDERATED_IDENTITY_API: - case ContentSettingsTypes.IMAGES: - case ContentSettingsTypes.JAVASCRIPT: -- case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER: -+ case ContentSettingsTypes.JAVASCRIPT_JIT: - case ContentSettingsTypes.MIXEDSCRIPT: - case ContentSettingsTypes.PAYMENT_HANDLER: - case ContentSettingsTypes.POPUPS: -diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 3edf3a7f14612..1003e54c4ca38 100644 ---- a/chrome/browser/resources/settings/privacy_page/privacy_page.html -+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -117,7 +117,7 @@ - $i18n{siteSettingsJavascriptOptimizerDescription} - - - - diff --git a/patches/user-preferences.patch b/patches/user-preferences.patch index 1d9f9efc..c2013930 100644 --- a/patches/user-preferences.patch +++ b/patches/user-preferences.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc -index 9be2589cac759..50562fe458d7c 100644 +index d506286648bde..99041371e46ef 100644 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -172,6 +172,22 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -173,6 +173,22 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { } s_allowlist = new PrefsUtil::TypedPrefMap(); @@ -42,24 +42,24 @@ index 47120511edffd..53f2330898dd9 100644 class="hr" hidden="[[!showHr_( diff --git a/chrome/browser/resources/settings/privacy_page/security_page.html b/chrome/browser/resources/settings/privacy_page/security_page.html -index d54888d0e712f..82ddb98c12256 100644 +index 6ac062af92b06..34e88dd013ed6 100644 --- a/chrome/browser/resources/settings/privacy_page/security_page.html +++ b/chrome/browser/resources/settings/privacy_page/security_page.html -@@ -7,6 +7,9 @@ +@@ -4,6 +4,10 @@ padding: 0 var(--cr-section-padding); } + #webrtcLabel { + flex: 1; + } - ++ .bullet-line { align-items: center; -@@ -227,3 +230,44 @@ + display: flex; +@@ -389,6 +393,46 @@ on-click="onChromeCertificatesClick_"> -+ +
+

Hardening

+ + +
+ +