[cr149] SettingSource::kTpcdGrant deleted
This was being passed along in a place, which can be easily deleted, and in another place it was being used as a macro anchor, which has been corrected. Chromium changes: https://chromium.googlesource.com/chromium/src/+/4f6f66374bd8fb36de59c75b329361eb1f4a0396 commit 4f6f66374bd8fb36de59c75b329361eb1f4a0396 Author: Fiona Macintosh <fmacintosh@google.com> Date: Wed Apr 15 01:49:38 2026 -0700 Delete remaining obsolete 3PCD-related enum values Removes k3PCDMetadata, kTpcdGrant, kEnforcedByTpcdGrant Change-Id: Id9f3ac6fc20334ade63e62bb01d823396ea30a01 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7749186 Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Commit-Queue: Judith Hemp <hempjudith@google.com> Reviewed-by: Judith Hemp <hempjudith@google.com> Auto-Submit: Fiona Macintosh <fmacintosh@google.com> Reviewed-by: Maks Orlovich <morlovich@chromium.org> Reviewed-by: Christian Dullweber <dullweber@chromium.org> Cr-Commit-Position: refs/heads/main@{#1615003}
This commit is contained in:
@@ -16,11 +16,11 @@
|
||||
return; \
|
||||
PermissionsClient::Get()->GetUkmSourceId
|
||||
|
||||
#define kTpcdGrant \
|
||||
#define kOsJavascriptOptimizer \
|
||||
kRemoteList: \
|
||||
source_suffix = "FromRemoteList"; \
|
||||
break; \
|
||||
case SettingSource::kTpcdGrant
|
||||
case SettingSource::kOsJavascriptOptimizer
|
||||
|
||||
// Don't let GetPermissionStringForUma hit NOTREACHED for missing Brave types.
|
||||
#define BRAVE_GET_PERMISSION_STRING_FOR_UMA return "";
|
||||
@@ -28,4 +28,4 @@
|
||||
#include <components/permissions/permission_uma_util.cc>
|
||||
#undef BRAVE_GET_PERMISSION_STRING_FOR_UMA
|
||||
#undef GetUkmSourceId
|
||||
#undef kTpcdGrant
|
||||
#undef kOsJavascriptOptimizer
|
||||
|
||||
@@ -120,8 +120,6 @@ mojom::ContentSettingSource ConvertSettingsSource(
|
||||
return mojom::ContentSettingSource::kNone;
|
||||
case content_settings::SettingSource::kAllowList:
|
||||
return mojom::ContentSettingSource::kAllowList;
|
||||
case content_settings::SettingSource::kTpcdGrant:
|
||||
return mojom::ContentSettingSource::kTpcdGrant;
|
||||
case content_settings::SettingSource::kRemoteList:
|
||||
return mojom::ContentSettingSource::kRemoteList;
|
||||
case content_settings::SettingSource::kOsJavascriptOptimizer:
|
||||
|
||||
@@ -23,7 +23,6 @@ enum ContentSettingSource {
|
||||
kRemoteList,
|
||||
kSupervised,
|
||||
kInstalledWebApp,
|
||||
kTpcdGrant,
|
||||
kOsJavascriptOptimizer,
|
||||
kTest,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user