diff --git a/patches/disable-gen-ai-features-and-logging-by-default.patch b/patches/disable-gen-ai-features-and-logging-by-default.patch index b4067dfe..666b459d 100644 --- a/patches/disable-gen-ai-features-and-logging-by-default.patch +++ b/patches/disable-gen-ai-features-and-logging-by-default.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc -index a7c33cf116281..25bafa2243b90 100644 +index 9b388234f3dfe..5122dcfc5ea77 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc -@@ -529,7 +529,7 @@ void DevToolsWindow::RegisterProfilePrefs( +@@ -533,7 +533,7 @@ void DevToolsWindow::RegisterProfilePrefs( prefs::kDevToolsSyncedPreferencesSyncDisabled); registry->RegisterIntegerPref( prefs::kDevToolsGenAiSettings, @@ -11,35 +11,24 @@ index a7c33cf116281..25bafa2243b90 100644 } // static +diff --git a/components/optimization_guide/core/feature_registry/enterprise_policy_registry.cc b/components/optimization_guide/core/feature_registry/enterprise_policy_registry.cc +index e5d92f8730357..31c60742976d5 100644 +--- a/components/optimization_guide/core/feature_registry/enterprise_policy_registry.cc ++++ b/components/optimization_guide/core/feature_registry/enterprise_policy_registry.cc +@@ -52,7 +52,7 @@ void EnterprisePolicyRegistry::RegisterProfilePrefs( + registry->RegisterIntegerPref( + policy.name(), + static_cast(model_execution::prefs:: +- ModelExecutionEnterprisePolicyValue::kAllow), ++ ModelExecutionEnterprisePolicyValue::kDisable), + PrefRegistry::LOSSY_PREF); + } + // From that point on, it's too late to modify the registry as the prefs diff --git a/components/optimization_guide/core/model_execution/model_execution_prefs.cc b/components/optimization_guide/core/model_execution/model_execution_prefs.cc -index d33df93b9ad75..b61239d2cd221 100644 +index ec40581ed584f..12c5d6b7905c0 100644 --- a/components/optimization_guide/core/model_execution/model_execution_prefs.cc +++ b/components/optimization_guide/core/model_execution/model_execution_prefs.cc -@@ -30,19 +30,19 @@ const char kHistorySearchEnterprisePolicyAllowed[] = - void RegisterProfilePrefs(PrefRegistrySimple* registry) { - registry->RegisterIntegerPref( - kTabOrganizationEnterprisePolicyAllowed, -- static_cast(ModelExecutionEnterprisePolicyValue::kAllow), -+ static_cast(ModelExecutionEnterprisePolicyValue::kDisable), - PrefRegistry::LOSSY_PREF); - registry->RegisterIntegerPref( - kComposeEnterprisePolicyAllowed, -- static_cast(ModelExecutionEnterprisePolicyValue::kAllow), -+ static_cast(ModelExecutionEnterprisePolicyValue::kDisable), - PrefRegistry::LOSSY_PREF); - registry->RegisterIntegerPref( - kWallpaperSearchEnterprisePolicyAllowed, -- static_cast(ModelExecutionEnterprisePolicyValue::kAllow), -+ static_cast(ModelExecutionEnterprisePolicyValue::kDisable), - PrefRegistry::LOSSY_PREF); - registry->RegisterIntegerPref( - kHistorySearchEnterprisePolicyAllowed, -- static_cast(ModelExecutionEnterprisePolicyValue::kAllow), -+ static_cast(ModelExecutionEnterprisePolicyValue::kDisable), - PrefRegistry::LOSSY_PREF); - } - -@@ -138,7 +138,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -97,7 +97,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { registry->RegisterInt64Pref(localstate::kModelQualityLogggingClientId, 0, PrefRegistry::LOSSY_PREF); registry->RegisterIntegerPref( diff --git a/patches/remove-unused-preferences.patch b/patches/remove-unused-preferences.patch index 0b6bb073..e292d2db 100644 --- a/patches/remove-unused-preferences.patch +++ b/patches/remove-unused-preferences.patch @@ -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 f44cde44ed34f..361492b4390c7 100644 +index f44cde44ed34f..5789ec59b6879 100644 --- a/chrome/browser/resources/settings/basic_page/basic_page.html +++ b/chrome/browser/resources/settings/basic_page/basic_page.html @@ -17,7 +17,7 @@ @@ -43,20 +43,20 @@ index 6297480d4f357..16514e7c58c5e 100644 - - @@ -67,10 +67,10 @@ index af9ea12b78f9f..139c5ce048135 100644 learn-more-url="$i18n{safeBrowsingHelpCenterURL}"> @@ -105,47 +105,11 @@ index 8fd4f50e2d484..e47000e03a290 100644 - name="[[safeBrowsingSettingEnum_.ENHANCED]]" - pref="[[prefs.generated.safe_browsing]]" - label="$i18n{safeBrowsingEnhanced}" -- sub-label="[[getSafeBrowsingEnhancedSubLabel_( -- enableFriendlierSafeBrowsingSettings_)]]" +- sub-label="$i18n{safeBrowsingEnhancedDesc}" - indicator-aria-label="$i18n{controlledSettingPolicy}" - expand-aria-label="$i18n{safeBrowsingEnhancedExpandA11yLabel}" - on-expand-clicked="onEnhancedProtectionExpandButtonClicked_" - no-automatic-collapse> -- -- - - -- -
- - - @@ -277,19 +219,24 @@ index 8fd4f50e2d484..e47000e03a290 100644 - name="[[safeBrowsingSettingEnum_.DISABLED]]" - pref="[[prefs.generated.safe_browsing]]" - label="$i18n{safeBrowsingNone}" -- sub-label="[[getSafeBrowsingDisabledSubLabel_( -- enableFriendlierSafeBrowsingSettings_)]]" +- sub-label="$i18n{safeBrowsingNoneDesc}" - indicator-aria-label="$i18n{controlledSettingPolicy}"> - - -
+
-

$i18n{advancedPageTitle}

+

$i18n{securityPageTitle}

-