Patches for 126
This commit is contained in:
@@ -16,7 +16,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttl
|
||||
+++ b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
|
||||
@@ -77,7 +77,7 @@ FirstPartySetsNavigationThrottle::MaybeCreateNavigationThrottle(
|
||||
// The `service` might be null for some irregular profiles.
|
||||
// TODO(https://crbug.com/1348572): regular profiles and guest sessions
|
||||
// TODO(crbug.com/40233408): regular profiles and guest sessions
|
||||
// aren't mutually exclusive on ChromeOS.
|
||||
- if (!profile->IsRegularProfile() || profile->IsGuestSession())
|
||||
+ if (((true)) || !profile->IsRegularProfile() || profile->IsGuestSession())
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttl
|
||||
diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
|
||||
--- a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
|
||||
+++ b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
|
||||
@@ -58,6 +58,7 @@ const base::Value::Dict* GetOverridesPolicyForProfile(
|
||||
@@ -59,6 +59,7 @@ const base::Value::Dict* GetOverridesPolicyForProfile(
|
||||
}
|
||||
|
||||
ServiceState GetServiceState(Profile* profile, bool pref_enabled) {
|
||||
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
|
||||
if (profile->IsSystemProfile() || profile->IsGuestSession() ||
|
||||
profile->IsOffTheRecord()) {
|
||||
return ServiceState::kPermanentlyDisabled;
|
||||
@@ -107,7 +108,7 @@ void FirstPartySetsPolicyService::Init() {
|
||||
@@ -112,7 +113,7 @@ void FirstPartySetsPolicyService::Init() {
|
||||
profile, profile->GetPrefs() &&
|
||||
profile->GetPrefs()->GetBoolean(
|
||||
prefs::kPrivacySandboxRelatedWebsiteSetsEnabled));
|
||||
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
|
||||
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
|
||||
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
|
||||
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
|
||||
@@ -419,7 +419,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
|
||||
@@ -424,7 +424,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
|
||||
void PrivacySandboxServiceImpl::SetFirstPartySetsDataAccessEnabled(
|
||||
bool enabled) {
|
||||
pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
|
||||
|
||||
Reference in New Issue
Block a user