diff --git a/build/patches/00Keep-Side-Panel-Companion-disabled.patch b/build/patches/00Keep-Side-Panel-Companion-disabled.patch index 2b08943c..e2075f42 100644 --- a/build/patches/00Keep-Side-Panel-Companion-disabled.patch +++ b/build/patches/00Keep-Side-Panel-Companion-disabled.patch @@ -4,11 +4,11 @@ Subject: Keep Side Panel Companion disabled License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/companion/core/features.cc | 19 ++++++++++--------- + chrome/browser/companion/core/features.cc | 23 ++++++++++--------- .../ui/side_search/side_search_prefs.cc | 2 +- chrome/browser/ui/ui_features.cc | 2 +- components/search_engines/template_url.cc | 2 +- - 4 files changed, 13 insertions(+), 12 deletions(-) + 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/chrome/browser/companion/core/features.cc b/chrome/browser/companion/core/features.cc --- a/chrome/browser/companion/core/features.cc @@ -40,6 +40,17 @@ diff --git a/chrome/browser/companion/core/features.cc b/chrome/browser/companio } // namespace internal // When search companion is enabled, show a context menu item that allows the +@@ -53,8 +53,8 @@ BASE_FEATURE(kCompanionEnableNewBadgesInContextMenu, + // user had previously opted in. The user won't be able to opt in (or out) when + // this is disabled. + BASE_FEATURE(kCompanionEnablePageContent, +- "CompanionEnablePageContent", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "CompanionEnablePageContent", // keep ++ base::FEATURE_DISABLED_BY_DEFAULT); // disabled + } // namespace features + + namespace switches { @@ -65,6 +65,7 @@ const char kDisableCheckUserPermissionsForCompanion[] = const char kForceCompanionPinnedState[] = "force-companion-pinned-state"; diff --git a/build/patches/00Keep-disabled-FetchLaterAPI.patch b/build/patches/00Keep-disabled-FetchLaterAPI.patch index 85045ed4..bd092e74 100644 --- a/build/patches/00Keep-disabled-FetchLaterAPI.patch +++ b/build/patches/00Keep-disabled-FetchLaterAPI.patch @@ -3,9 +3,35 @@ Date: Thu, 28 Sep 2023 08:11:00 +0000 Subject: Keep disabled FetchLaterAPI --- - .../blink/renderer/platform/runtime_enabled_features.json5 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + third_party/blink/common/features.cc | 8 ++++---- + .../renderer/platform/runtime_enabled_features.json5 | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) +diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc +--- a/third_party/blink/common/features.cc ++++ b/third_party/blink/common/features.cc +@@ -1026,8 +1026,8 @@ BASE_FEATURE(kKalmanHeuristics, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kKeepAliveInBrowserMigration, +- "KeepAliveInBrowserMigration", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "KeepAliveInBrowserMigration", // keep ++ base::FEATURE_DISABLED_BY_DEFAULT); // disabled + + // Enables reporting as LCP of the time the first frame of an animated image was + // painted. +@@ -1278,8 +1278,8 @@ BASE_FEATURE(kPath2DPaintCache, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kPendingBeaconAPI, +- "PendingBeaconAPI", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "PendingBeaconAPI", // keep ++ base::FEATURE_DISABLED_BY_DEFAULT); // disabled + const base::FeatureParam kPendingBeaconAPIRequiresOriginTrial = { + &kPendingBeaconAPI, "requires_origin_trial", false}; + const base::FeatureParam kPendingBeaconAPIForcesSendingOnNavigation = { diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch index 46f819cb..c7237502 100644 --- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch @@ -11,6 +11,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../browser/net/profile_network_context_service.cc | 8 ++++---- .../core/common/cookie_settings_base.cc | 2 +- + components/content_settings/core/common/features.cc | 4 ++-- + components/permissions/features.cc | 4 ++-- content/public/common/content_features.cc | 4 ++-- net/base/features.cc | 12 ++++++------ net/cookies/canonical_cookie.cc | 12 +----------- @@ -23,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../renderer/modules/cookie_store/cookie_store.cc | 12 ++++++++++++ .../cookie_store/cookie_store_delete_options.idl | 2 +- ui/webui/webui_allowlist.cc | 1 + - 14 files changed, 51 insertions(+), 29 deletions(-) + 16 files changed, 55 insertions(+), 33 deletions(-) diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc --- a/chrome/browser/net/profile_network_context_service.cc @@ -59,6 +61,34 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c : ThirdPartyBlockingScope::kUnpartitionedAndPartitioned; } return {block_third ? CONTENT_SETTING_BLOCK : setting, scope, +diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc +--- a/components/content_settings/core/common/features.cc ++++ b/components/content_settings/core/common/features.cc +@@ -79,8 +79,8 @@ BASE_FEATURE(kImprovedSemanticsActivityIndicators, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kTrackingProtection3pcd, +- "TrackingProtection3pcd", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "TrackingProtection3pcd", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + + } // namespace features + } // namespace content_settings +diff --git a/components/permissions/features.cc b/components/permissions/features.cc +--- a/components/permissions/features.cc ++++ b/components/permissions/features.cc +@@ -156,8 +156,8 @@ BASE_FEATURE(kMitigateUnpartitionedWebviewPermissions, + // This includes enabling prompts, a new settings page and page info and + // omnibox integration. + BASE_FEATURE(kPermissionStorageAccessAPI, +- "PermissionStorageAccessAPI", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "PermissionStorageAccessAPI", // guard ++ base::FEATURE_DISABLED_BY_DEFAULT); // this + + // When enabled "window-placement" may be used as an alias for + // "window-management". Additionally, reverse mappings (i.e. enum to string) diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc