1 files changed, 42 insertions, 28 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
index a4e7e8b..824e4e5 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
@@ -1,26 +1,6 @@
---- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig
-+++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
-@@ -378,7 +378,7 @@ std::vector<GURL> PrivacySandboxSettings
- }
- 
- bool PrivacySandboxSettings::IsPrivacySandboxAllowed() {
--  return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
-+  return false;
- }
- 
- bool PrivacySandboxSettings::IsPrivacySandboxEnabled() {
-@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa
- }
- 
- void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
--  pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true);
--  pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
- }
- 
- void PrivacySandboxSettings::OnCookiesCleared() {
---- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
-+++ chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -64,19 +64,6 @@
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
++++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -80,19 +80,6 @@
              sub-label="$i18n{permissionsPageDescription}"
              on-click="onPermissionsPageClick_"
              role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
@@ -29,7 +9,7 @@
 -            class="hr"
 -            label="$i18n{privacySandboxTitle}"
 -            sub-label="[[computePrivacySandboxSublabel_(
--                prefs.privacy_sandbox.apis_enabled.*)]]"
+-                prefs.privacy_sandbox.*)]]"
 -            on-click="onPrivacySandboxClick_"
 -            external
 -            role-description="$i18n{subpageArrowRoleDescription}">
@@ -40,14 +20,48 @@
        </div>
  
  <if expr="use_nss_certs">
---- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig
-+++ components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -31,7 +31,7 @@ namespace privacy_sandbox {
+--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
++++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
+@@ -48,7 +48,7 @@ namespace privacy_sandbox {
  
  void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
 -      prefs::kPrivacySandboxApisEnabled, true,
 +      prefs::kPrivacySandboxApisEnabled, false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
    registry->RegisterBooleanPref(
-       prefs::kPrivacySandboxManuallyControlled, false,
+--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
++++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
+@@ -290,31 +290,10 @@ std::vector<GURL> PrivacySandboxSettings
+ }
+ 
+ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+-  // Which preference is consulted is dependent on whether release 3 of the
+-  // settings is available.
+-  if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
+-    // For Privacy Sandbox Settings 3, APIs are disabled in incognito.
+-    if (incognito_profile_)
+       return false;
+-
+-    // The V2 pref was introduced with the 3rd Privacy Sandbox release.
+-    return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2);
+-  }
+-
+-  return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
+ }
+ 
+ void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+-  pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true);
+-
+-  // Only apply the decision to the appropriate preference. Confirmation logic
+-  // DCHECKS that the user has not been able to enable the V2 preference
+-  // without seeing a dialog.
+-  if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
+-    pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
+-  } else {
+-    pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
+-  }
+ }
+ 
+ bool PrivacySandboxSettings::IsTrustTokensAllowed() {