Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git apply result for new-method-change-flags branch #561

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Git apply result for new-method-change-flags branch #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build/patches/Add-site-engagement-flag.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/site_engagement/core/BUILD.gn | 6 ++++
components/site_engagement/core/features.cc | 30 ++++++++++++++++
components/site_engagement/core/features.h | 34 +++++++++++++++++++
.../Add-site-engagement-flag.inc | 11 ++++++
6 files changed, 87 insertions(+)
.../Add-site-engagement-flag.inc | 10 ++++++
6 files changed, 86 insertions(+)
create mode 100644 components/site_engagement/core/features.cc
create mode 100644 components/site_engagement/core/features.h
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
Expand Down Expand Up @@ -147,7 +147,7 @@ diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-fla
new file mode 100644
--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
@@ -0,0 +1,11 @@
@@ -0,0 +1,10 @@
+#ifdef FLAG_SECTION
+
+ {"site-engagement",
Expand All @@ -158,6 +158,5 @@ new file mode 100644
+ FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)},
+
+#endif
+
--
2.25.1
7 changes: 3 additions & 4 deletions build/patches/Disable-conversion-measurement-api.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
content/renderer/render_thread_impl.cc | 5 +-
.../Disable-conversion-measurement-api.inc | 1 +
.../Disable-conversion-measurement-api.inc | 1 +
.../Disable-conversion-measurement-api.inc | 10 +
.../Disable-conversion-measurement-api.inc | 9 +
.../attribution/request_headers_internal.cc | 1 +
.../network/public/cpp/attribution_utils.cc | 2 +
ui/events/android/motion_event_android.cc | 6 +-
23 files changed, 68 insertions(+), 241 deletions(-)
23 files changed, 67 insertions(+), 241 deletions(-)
create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
Expand Down Expand Up @@ -612,7 +612,7 @@ diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversi
new file mode 100644
--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
@@ -0,0 +1,10 @@
@@ -0,0 +1,9 @@
+SET_CROMITE_FEATURE_DISABLED(kAdAuctionReportingWithMacroApi);
+SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
Expand All @@ -622,7 +622,6 @@ new file mode 100644
+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIs);
+SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
+
diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc
--- a/services/network/attribution/request_headers_internal.cc
+++ b/services/network/attribution/request_headers_internal.cc
Expand Down
Loading