Skip to content

Commit 835551c

Browse files
committed
update all brave_shields constants to inline constexpr char
1 parent f02a516 commit 835551c

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

components/brave_shields/core/common/brave_shield_constants.h

+26-22
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,39 @@
1010

1111
namespace brave_shields {
1212

13-
const char kAds[] = "shieldsAds";
14-
const char kCosmeticFiltering[] = "cosmeticFiltering";
15-
const char kTrackers[] = "trackers";
16-
const char kHTTPUpgradableResources[] = "httpUpgradableResources";
17-
const char kHTTPSUpgrades[] = "httpsUpgrades";
18-
const char kJavaScript[] = "javascript";
19-
const char kFingerprintingV2[] = "fingerprintingV2";
20-
const char kBraveShields[] = "braveShields";
21-
const char kReferrers[] = "referrers";
22-
const char kCookies[] = "shieldsCookiesV3";
23-
const char kFacebookEmbeds[] = "fb-embeds";
24-
const char kTwitterEmbeds[] = "twitter-embeds";
25-
const char kLinkedInEmbeds[] = "linked-in-embeds";
13+
inline constexpr char kAds[] = "shieldsAds";
14+
inline constexpr char kCosmeticFiltering[] = "cosmeticFiltering";
15+
inline constexpr char kTrackers[] = "trackers";
16+
inline constexpr char kHTTPUpgradableResources[] = "httpUpgradableResources";
17+
inline constexpr char kHTTPSUpgrades[] = "httpsUpgrades";
18+
inline constexpr char kJavaScript[] = "javascript";
19+
inline constexpr char kFingerprintingV2[] = "fingerprintingV2";
20+
inline constexpr char kBraveShields[] = "braveShields";
21+
inline constexpr char kReferrers[] = "referrers";
22+
inline constexpr char kCookies[] = "shieldsCookiesV3";
23+
inline constexpr char kFacebookEmbeds[] = "fb-embeds";
24+
inline constexpr char kTwitterEmbeds[] = "twitter-embeds";
25+
inline constexpr char kLinkedInEmbeds[] = "linked-in-embeds";
2626

2727
// Values used before the migration away from ResourceIdentifier, kept around
2828
// for migration purposes only.
29-
const char kObsoleteAds[] = "ads";
30-
const char kObsoleteCookies[] = "cookies";
31-
const char kObsoleteShieldsCookies[] = "shieldsCookies";
29+
inline constexpr char kObsoleteAds[] = "ads";
30+
inline constexpr char kObsoleteCookies[] = "cookies";
31+
inline constexpr char kObsoleteShieldsCookies[] = "shieldsCookies";
3232

3333
// Some users were not properly migrated from fingerprinting V1.
34-
const char kObsoleteFingerprinting[] = "fingerprinting";
34+
inline constexpr char kObsoleteFingerprinting[] = "fingerprinting";
3535

3636
// Filename for cached text from a custom filter list subscription
3737
const base::FilePath::CharType kCustomSubscriptionListText[] =
3838
FILE_PATH_LITERAL("list_text.txt");
3939

40-
const char kCookieListUuid[] = "AC023D22-AE88-4060-A978-4FEEEC4221693";
41-
const char kMobileNotificationsListUuid[] =
40+
inline constexpr char kCookieListUuid[] =
41+
"AC023D22-AE88-4060-A978-4FEEEC4221693";
42+
inline constexpr char kMobileNotificationsListUuid[] =
4243
"2F3DCE16-A19A-493C-A88F-2E110FBD37D6";
43-
const char kExperimentalListUuid[] = "564C3B75-8731-404C-AD7C-5683258BA0B0";
44+
inline constexpr char kExperimentalListUuid[] =
45+
"564C3B75-8731-404C-AD7C-5683258BA0B0";
4446

4547
inline constexpr char kAdBlockResourceComponentName[] =
4648
"Brave Ad Block Resources Library";
@@ -68,8 +70,10 @@ inline constexpr char kAdBlockFilterListCatalogComponentBase64PublicKey[] =
6870
"1H8y9SR970LqsUMozu3ioSHtFh/IVgq7Nqy4TljaKsTE+3AdtjiOyHpW9ZaOkA7j"
6971
"2QIDAQAB";
7072

71-
const char kCookieListEnabledHistogram[] = "Brave.Shields.CookieListEnabled";
72-
const char kCookieListPromptHistogram[] = "Brave.Shields.CookieListPrompt";
73+
inline constexpr char kCookieListEnabledHistogram[] =
74+
"Brave.Shields.CookieListEnabled";
75+
inline constexpr char kCookieListPromptHistogram[] =
76+
"Brave.Shields.CookieListPrompt";
7377

7478
} // namespace brave_shields
7579

0 commit comments

Comments
 (0)